merged 0.2 branch into trunk; 0.1 now in sqlalchemy/branches/rel_0_1

1 files changed, 4 insertions, 10 deletions

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 94a0fcb6d..acbacafa4 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -4,20 +4,14 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from engine import *
 from types import *
 from sql import *
 from schema import *
-from exceptions import *
-import sqlalchemy.sql
-import sqlalchemy.mapping as mapping
-from sqlalchemy.mapping import *
-import sqlalchemy.schema
-import sqlalchemy.ext.proxy
-sqlalchemy.schema.default_engine = sqlalchemy.ext.proxy.ProxyEngine()
+from sqlalchemy.orm import *
 
-from sqlalchemy.mods import install_mods
+from sqlalchemy.engine import create_engine
+from sqlalchemy.schema import default_metadata
 
 def global_connect(*args, **kwargs):
-    sqlalchemy.schema.default_engine.connect(*args, **kwargs)
+    default_metadata.connect(*args, **kwargs)
     
\ No newline at end of file