From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 3 Dec 2005 06:27:40 +0000 (+0000)
Subject: tweek
X-Git-Tag: rel_0_1_0~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef14dac5895e408ad6a5100140218d63741cb13b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

tweek
---

diff --git a/lib/sqlalchemy/mapping/properties.py b/lib/sqlalchemy/mapping/properties.py
index d678f9f16d..195afc09d6 100644
--- a/lib/sqlalchemy/mapping/properties.py
+++ b/lib/sqlalchemy/mapping/properties.py
@@ -83,15 +83,15 @@ class PropertyLoader(MapperProperty):
         return self._hash_key
 
     def init(self, key, parent):
+        import sqlalchemy.mapping
         if isinstance(self.argument, type):
-            import sqlalchemy.mapping
             self.mapper = sqlalchemy.mapping.class_mapper(self.argument)
         else:
             self.mapper = self.argument
 
         if self.association is not None:
             if isinstance(self.association, type):
-                self.association = class_mapper(self.association)
+                self.association = sqlalchemy.mapping.class_mapper(self.association)
         
         self.target = self.mapper.table
         self.key = key