summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-06-02 12:06:39 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-06-02 12:06:39 -0400
commit32716eae773e6f6b7f37baf705342c1ed89df461 (patch)
tree0f99019fc9db8cb34b9ba14c0b8469f4cb7d6cd6 /lib/sqlalchemy/orm/query.py
parent832d657854f6fca8a1925e89f0ad20d260dc9e45 (diff)
downloadsqlalchemy-32716eae773e6f6b7f37baf705342c1ed89df461.tar.gz
- blow away context._attributes
- to account for query._attributes/context.attributes, just pass the attributes dict directly to the PathRegistry methods
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 79fd61c63..beae7aba0 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3186,7 +3186,7 @@ class QueryContext(object):
self.create_eager_joins = []
self.propagate_options = set(o for o in query._with_options if
o.propagate_to_loaders)
- self.attributes = self._attributes = query._attributes.copy()
+ self.attributes = query._attributes.copy()
class AliasOption(interfaces.MapperOption):