bind/connectable compat, allow .bind = None

fix import for DBAPIError raise

diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index f295f5fd24666461e81e5c56b3cd6a32e4507acd..95f6566e3bdbd64c0ce7a3119f6960c3690769c8 100644 (file)
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -142,7 +142,7 @@ class DefaultDialect(base.Dialect):
             # to appropriate character upon compilation
             self.positional = True
         else:
-            raise DBAPIError("Unsupported paramstyle '%s'" % self._paramstyle)
+            raise exceptions.DBAPIError("Unsupported paramstyle '%s'" % self._paramstyle)
 
     def _get_ischema(self):
         if self._ischema is None:

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index d9df0da90c159c79ec4ad0a9bb50951702d4dbfb..a6e3f5f29e1ff16ed6d900c104b42966d854110c 100644 (file)
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -1191,8 +1191,6 @@ class MetaData(SchemaItem):
         
         if bind is None:
             bind = kwargs.pop('engine_or_url', None)
-        if bind is None:
-            raise exceptions.ArguemntError("'bind' argument is required for connect()")
         from sqlalchemy.engine.url import URL
         if isinstance(bind, (basestring, URL)):
             self._bind = sqlalchemy.create_engine(bind, **kwargs)