diff options
| -rw-r--r-- | lib/sqlalchemy/databases/sqlite.py | 7 | ||||
| -rw-r--r-- | test/orm/dynamic.py | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py index 9492de8da..d01793b9d 100644 --- a/lib/sqlalchemy/databases/sqlite.py +++ b/lib/sqlalchemy/databases/sqlite.py @@ -165,8 +165,6 @@ class SQLiteDialect(ansisql.ANSIDialect): sqlite_ver = self.dbapi.version_info if sqlite_ver < (2,1,'3'): warnings.warn(RuntimeWarning("The installed version of pysqlite2 (%s) is out-dated, and will cause errors in some cases. Version 2.1.3 or greater is recommended." % '.'.join([str(subver) for subver in sqlite_ver]))) - if vers(self.dbapi.sqlite_version) < vers("3.3.13"): - warnings.warn(RuntimeWarning("The installed version of sqlite (%s) is out-dated, and will cause errors in some cases. Version 3.3.13 or greater is recommended." % self.dbapi.sqlite_version)) self.supports_cast = (self.dbapi is None or vers(self.dbapi.sqlite_version) >= vers("3.2.3")) def dbapi(cls): @@ -176,10 +174,7 @@ class SQLiteDialect(ansisql.ANSIDialect): try: from sqlite3 import dbapi2 as sqlite #try the 2.5+ stdlib name. except ImportError: - try: - sqlite = __import__('sqlite') # skip ourselves - except ImportError: - raise e + raise e return sqlite dbapi = classmethod(dbapi) diff --git a/test/orm/dynamic.py b/test/orm/dynamic.py index 958f5b159..ac6764653 100644 --- a/test/orm/dynamic.py +++ b/test/orm/dynamic.py @@ -100,7 +100,7 @@ class FlushTest(FixtureTest): del u.addresses[3] assert False except TypeError, e: - assert str(e) == "object doesn't support item deletion" + assert "doesn't support item deletion" in str(e), str(e) for a in u.addresses.filter(Address.email_address.in_('c', 'e', 'f')): u.addresses.remove(a) |