diff options
| author | Jason Kirtland <jek@discorporate.us> | 2008-05-21 20:32:00 +0000 |
|---|---|---|
| committer | Jason Kirtland <jek@discorporate.us> | 2008-05-21 20:32:00 +0000 |
| commit | afb2ca13a3cb7f34bd66f62e1c007123b7ce2ed1 (patch) | |
| tree | 2e531333285b477d5f6e6625dbafbe62d4344409 /lib/sqlalchemy/orm | |
| parent | 38681c6b39baac9c79b4633f4aa5892512441606 (diff) | |
| download | sqlalchemy-afb2ca13a3cb7f34bd66f62e1c007123b7ce2ed1.tar.gz | |
Updated some todos.
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/identity.py | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index 1d5125c49..295535b6d 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -36,8 +36,8 @@ The value of this attribute must be a callable and will be passed a class object. The callable must return one of: - An instance of an interfaces.InstrumentationManager or subclass - - An object implementing all or some of InstrumentationManager (todo) - - A dictionary of callables, implementing all or some of the above (todo) + - An object implementing all or some of InstrumentationManager (TODO) + - A dictionary of callables, implementing all or some of the above (TODO) - An instance of a ClassManager or subclass interfaces.InstrumentationManager is public API and will remain stable diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py index 4487e21dc..6369d5a3c 100644 --- a/lib/sqlalchemy/orm/identity.py +++ b/lib/sqlalchemy/orm/identity.py @@ -239,7 +239,6 @@ class IdentityManagedState(attributes.InstanceState): obj = self.manager.new_instance(state=self) self.obj = weakref.ref(obj, self._cleanup) self._strong_obj = obj - # todo: revisit this wrt user-defined-state obj.__dict__.update(self.dict) self.dict = obj.__dict__ self._run_on_load(obj) |