summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/dynamic.py
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2007-08-13 07:09:56 +0000
committerJason Kirtland <jek@discorporate.us>2007-08-13 07:09:56 +0000
commit05eb3073df25c1add9657b503230ea500514e351 (patch)
tree97cec4d254473d1fca31e7de36476edb121e2fc6 /lib/sqlalchemy/orm/dynamic.py
parenta19fa666ba3842fa84cfc59da06055f472a6f5a6 (diff)
downloadsqlalchemy-05eb3073df25c1add9657b503230ea500514e351.tar.gz
Removed unused imports, other import adjustments per pyflakes
Diffstat (limited to 'lib/sqlalchemy/orm/dynamic.py')
-rw-r--r--lib/sqlalchemy/orm/dynamic.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/dynamic.py b/lib/sqlalchemy/orm/dynamic.py
index dee2e28ce..fe3628df2 100644
--- a/lib/sqlalchemy/orm/dynamic.py
+++ b/lib/sqlalchemy/orm/dynamic.py
@@ -4,7 +4,7 @@ a special AttributeHistory on the 'write' side."""
from sqlalchemy import exceptions
from sqlalchemy.orm import attributes, object_session
from sqlalchemy.orm.query import Query
-from sqlalchemy.orm.mapper import has_identity
+from sqlalchemy.orm.mapper import has_identity, object_mapper
class DynamicCollectionAttribute(attributes.InstrumentedAttribute):
def __init__(self, class_, attribute_manager, key, typecallable, target_mapper, **kwargs):
@@ -98,9 +98,9 @@ class AppenderQuery(Query):
sess = object_session(self.instance)
if sess is None:
try:
- sess = mapper.object_mapper(instance).get_session()
+ sess = object_mapper(self.instance).get_session()
except exceptions.InvalidRequestError:
- raise exceptions.InvalidRequestError("Parent instance %s is not bound to a Session, and no contextual session is established; lazy load operation of attribute '%s' cannot proceed" % (instance.__class__, self.key))
+ raise exceptions.InvalidRequestError("Parent instance %s is not bound to a Session, and no contextual session is established; lazy load operation of attribute '%s' cannot proceed" % (self.instance.__class__, self.key))
return sess.query(self.attr.target_mapper).with_parent(self.instance)