projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
64a781b
)
Oops, store the serialized Experiment in state not self.info.
author
W. Trevor King
<wking@drexel.edu>
Sat, 21 Aug 2010 16:01:19 +0000
(12:01 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Sat, 21 Aug 2010 16:01:19 +0000
(12:01 -0400)
hooke/curve.py
patch
|
blob
|
history
diff --git
a/hooke/curve.py
b/hooke/curve.py
index af572f3cfd1a6794657dc9aca9272e9bbd094e95..75fbf75ce2f394bb9d03dcf39e29ca69bf0419ef 100644
(file)
--- a/
hooke/curve.py
+++ b/
hooke/curve.py
@@
-191,17
+191,18
@@
class Curve (object):
self.name = os.path.basename(path)
def __getstate__(self):
self.name = os.path.basename(path)
def __getstate__(self):
- state = dict(self.__dict__)
+ state = dict(self.__dict__) # make a copy of the attribute dict.
+ state['info'] = dict(self.info) # make a copy of the info dict too.
del(state['_hooke'])
dc = state['command_stack']
if hasattr(dc, '__getstate__'):
state['command_stack'] = dc.__getstate__()
del(state['_hooke'])
dc = state['command_stack']
if hasattr(dc, '__getstate__'):
state['command_stack'] = dc.__getstate__()
- if s
elf.info
.get('experiment', None) != None:
- e = s
elf.info
['experiment']
- assert isinstance(e, experiment.Experiment)
+ if s
tate['info']
.get('experiment', None) != None:
+ e = s
tate['info']
['experiment']
+ assert isinstance(e, experiment.Experiment)
, type(e)
# HACK? require Experiment classes to be defined in the
# experiment module.
# HACK? require Experiment classes to be defined in the
# experiment module.
- s
elf.info
['experiment'] = e.__class__.__name__
+ s
tate['info']
['experiment'] = e.__class__.__name__
return state
def __setstate__(self, state):
return state
def __setstate__(self, state):
@@
-213,7
+214,7
@@
class Curve (object):
elif key == 'info':
if 'experiment' not in value:
value['experiment'] = None
elif key == 'info':
if 'experiment' not in value:
value['experiment'] = None
- el
s
e:
+ el
if value['experiment'] != Non
e:
# HACK? require Experiment classes to be defined in the
# experiment module.
cls = getattr(experiment, value['experiment'])
# HACK? require Experiment classes to be defined in the
# experiment module.
cls = getattr(experiment, value['experiment'])