fixed tree examples import scheme, tweak to properties import

diff --git a/examples/adjacencytree/basic_tree.py b/examples/adjacencytree/basic_tree.py
index 58132430cd30d70a620b9ce52e61d5b534fa41e9..39c5c24e4588ec84ef8b86e0541b0a39c1339a3d 100644 (file)
--- 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 ee1dd4a4953ab1dcb984204065f093e3718cf6e3..ea5b9fac78b9711e763ebe49537ff6d9585f4bae 100644 (file)
--- 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 4a619aee946f80b72fbdc702a29a543230815e82..ed70946e6e8b530109b470acdc8f41a15147b0f3 100644 (file)
--- 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 8e021efefef031e691b93e2420cfc431f918a5a0..d678f9f16dcb5a851bae7425d3b654536c69fc2b 100644 (file)
--- 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