From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 3 Dec 2005 06:18:55 +0000 (+0000)
Subject: fixed tree examples import scheme, tweak to properties import
X-Git-Tag: rel_0_1_0~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c02e113df3b77bb8f578f8af58535b0452eee01f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fixed tree examples import scheme, tweak to properties import
---

diff --git a/examples/adjacencytree/basic_tree.py b/examples/adjacencytree/basic_tree.py
index 58132430cd..39c5c24e45 100644
--- a/examples/adjacencytree/basic_tree.py
+++ b/examples/adjacencytree/basic_tree.py
@@ -1,6 +1,4 @@
-from sqlalchemy.mapper import *
-from sqlalchemy.schema import *
-from sqlalchemy.sql import *
+from sqlalchemy import *
 import sqlalchemy.util as util
 import tables
 import string, sys
diff --git a/examples/adjacencytree/byroot_tree.py b/examples/adjacencytree/byroot_tree.py
index ee1dd4a495..ea5b9fac78 100644
--- a/examples/adjacencytree/byroot_tree.py
+++ b/examples/adjacencytree/byroot_tree.py
@@ -1,6 +1,4 @@
-from sqlalchemy.mapper import *
-from sqlalchemy.schema import *
-from sqlalchemy.sql import *
+from sqlalchemy import *
 import sqlalchemy.util as util
 import tables
 import string, sys, time
diff --git a/examples/adjacencytree/tables.py b/examples/adjacencytree/tables.py
index 4a619aee94..ed70946e6e 100644
--- a/examples/adjacencytree/tables.py
+++ b/examples/adjacencytree/tables.py
@@ -1,8 +1,7 @@
-from sqlalchemy.schema import *
-import sqlalchemy.engine
+from sqlalchemy import *
 import os
 
-engine = sqlalchemy.engine.create_engine('sqlite', {'filename':':memory:'}, echo = True)
+engine = create_engine('sqlite', {'filename':':memory:'}, echo = True)
 #engine = sqlalchemy.engine.create_engine('mysql', {'db':'test', 'host':'127.0.0.1', 'user':'scott'}, echo=True)
 #engine = sqlalchemy.engine.create_engine('postgres', {'database':'test', 'host':'127.0.0.1', 'user':'scott', 'password':'tiger'}, echo=True)
 #engine = sqlalchemy.engine.create_engine('oracle', {'dsn':os.environ['DSN'], 'user':os.environ['USER'], 'password':os.environ['PASSWORD']}, echo=True)
diff --git a/lib/sqlalchemy/mapping/properties.py b/lib/sqlalchemy/mapping/properties.py
index 8e021efefe..d678f9f16d 100644
--- a/lib/sqlalchemy/mapping/properties.py
+++ b/lib/sqlalchemy/mapping/properties.py
@@ -84,7 +84,8 @@ class PropertyLoader(MapperProperty):
 
     def init(self, key, parent):
         if isinstance(self.argument, type):
-            self.mapper = class_mapper(self.argument)
+            import sqlalchemy.mapping
+            self.mapper = sqlalchemy.mapping.class_mapper(self.argument)
         else:
             self.mapper = self.argument