Skip to content

Commit

Permalink
PEP-8ify additions as recommended by the pep8 tool.
Browse files Browse the repository at this point in the history
  • Loading branch information
jamadden committed Feb 26, 2013
1 parent ad3e7a0 commit 672237d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
13 changes: 6 additions & 7 deletions src/zope/container/folder.py
Expand Up @@ -31,14 +31,13 @@ def data(self):
def data(self, value):
self._SampleContainer__data = value


def __getstate__( self ):
state = super(Folder,self).__getstate__()
data = state.pop( '_SampleContainer__data' )
def __getstate__(self):
state = super(Folder, self).__getstate__()
data = state.pop('_SampleContainer__data')
state['data'] = data
return state

def __setstate__( self, state ):
def __setstate__(self, state):
if 'data' in state and '_SampleContainer__data' not in state:
state['_SampleContainer__data'] = state.pop( 'data' )
super(Folder,self).__setstate__( state )
state['_SampleContainer__data'] = state.pop('data')
super(Folder, self).__setstate__(state)
6 changes: 3 additions & 3 deletions src/zope/container/tests/test_folder.py
Expand Up @@ -19,10 +19,10 @@ def testDataAccess(self):
def testPickleCompatibility(self):
folder = self.makeTestObject()
folder['a'] = 1
self.assertEqual( folder.__getstate__()['data'], folder._SampleContainer__data )
self.assertEqual(folder.__getstate__()['data'], folder._SampleContainer__data)

folder_clone = pickle.loads( pickle.dumps( folder ) )
self.assertEqual( folder_clone['a'], folder['a'] )
folder_clone = pickle.loads(pickle.dumps(folder))
self.assertEqual(folder_clone['a'], folder['a'])


def test_suite():
Expand Down

0 comments on commit 672237d

Please sign in to comment.