From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 8 Jun 2006 17:04:15 +0000 (+0000)
Subject: fixed module scoping for class_mapper [ticket:201]
X-Git-Tag: rel_0_2_3~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a79583ef42f793649f2597b190a3a69ab317172;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fixed module scoping for class_mapper [ticket:201]
---

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index fbdb1bd17b..f7d5549008 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -8,11 +8,12 @@ import session as sessionlib
 from sqlalchemy import sql, util, exceptions
 import mapper
 
+
 class Query(object):
     """encapsulates the object-fetching operations provided by Mappers."""
     def __init__(self, class_or_mapper, session=None, entity_name=None, **kwargs):
         if isinstance(class_or_mapper, type):
-            self.mapper = class_mapper(class_or_mapper, entity_name=entity_name)
+            self.mapper = mapper.class_mapper(class_or_mapper, entity_name=entity_name)
         else:
             self.mapper = class_or_mapper.compile()
         self.mapper = self.mapper.get_select_mapper()