Updated some todos.

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 1d5125c491af4fbf70d62bb2af631195eada8848..295535b6d2b6b84b90bc3eb3135dc4e4e01c45f7 100644 (file)
--- 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 4487e21dc0a37bf5aefc84130ea2730ca4c2614a..6369d5a3c28fb5acdee4c105ae6df4efd51607fc 100644 (file)
--- 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)