- moved test/orm/fixtures.py to testlib

- flattened mapper calls in _instance() to operate directly
through a default MapperExtension
- more tests for ScopedSession, fixed [ticket:746]
- threadlocal engine propagates **kwargs through begin()

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index 5dad74124..aebcfcdfe 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -104,7 +104,7 @@ class _ScopedExt(MapperExtension):
             def __call__(s):
                 return self.context.registry().query(class_)
 
-        if not hasattr(class_, 'query'): 
+        if not 'query' in class_.__dict__: 
             class_.query = query()
         
     def init_instance(self, mapper, class_, oldinit, instance, args, kwargs):