tweek

diff --git a/lib/sqlalchemy/mapping/properties.py b/lib/sqlalchemy/mapping/properties.py
index d678f9f16dcb5a851bae7425d3b654536c69fc2b..195afc09d61fc4066d63fd2fc59860239fd58097 100644 (file)
--- 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