From: Jason Kirtland <jek@discorporate.us>
Date: Tue, 17 Jul 2007 16:54:34 +0000 (+0000)
Subject: bind/connectable compat, allow .bind = None
X-Git-Tag: rel_0_3_10~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dba9d48c28d59523f952d5e6b2f1425450cd7db;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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 f295f5fd24..95f6566e3b 100644
--- 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 d9df0da90c..a6e3f5f29e 100644
--- 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)