summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/mapping/properties.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2005-12-03 06:27:40 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2005-12-03 06:27:40 +0000
commitef14dac5895e408ad6a5100140218d63741cb13b (patch)
tree2744ea4b9079db098f92a8973076fae21da4dbc4 /lib/sqlalchemy/mapping/properties.py
parentc02e113df3b77bb8f578f8af58535b0452eee01f (diff)
downloadsqlalchemy-ef14dac5895e408ad6a5100140218d63741cb13b.tar.gz
tweek
Diffstat (limited to 'lib/sqlalchemy/mapping/properties.py')
-rw-r--r--lib/sqlalchemy/mapping/properties.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/mapping/properties.py b/lib/sqlalchemy/mapping/properties.py
index d678f9f16..195afc09d 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