diff options
Diffstat (limited to 'django/db/backends/sqlite3')
| -rw-r--r-- | django/db/backends/sqlite3/base.py | 12 | ||||
| -rw-r--r-- | django/db/backends/sqlite3/creation.py | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index 8f883e2dc3..7ce9dd38eb 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -24,9 +24,9 @@ from django.utils import timezone try: try: from pysqlite2 import dbapi2 as Database - except ImportError, e1: + except ImportError: from sqlite3 import dbapi2 as Database -except ImportError, exc: +except ImportError as exc: from django.core.exceptions import ImproperlyConfigured raise ImproperlyConfigured("Error loading either pysqlite2 or sqlite3 modules (tried in that order): %s" % exc) @@ -335,18 +335,18 @@ class SQLiteCursorWrapper(Database.Cursor): query = self.convert_query(query) try: return Database.Cursor.execute(self, query, params) - except Database.IntegrityError, e: + except Database.IntegrityError as e: raise utils.IntegrityError, utils.IntegrityError(*tuple(e)), sys.exc_info()[2] - except Database.DatabaseError, e: + except Database.DatabaseError as e: raise utils.DatabaseError, utils.DatabaseError(*tuple(e)), sys.exc_info()[2] def executemany(self, query, param_list): query = self.convert_query(query) try: return Database.Cursor.executemany(self, query, param_list) - except Database.IntegrityError, e: + except Database.IntegrityError as e: raise utils.IntegrityError, utils.IntegrityError(*tuple(e)), sys.exc_info()[2] - except Database.DatabaseError, e: + except Database.DatabaseError as e: raise utils.DatabaseError, utils.DatabaseError(*tuple(e)), sys.exc_info()[2] def convert_query(self, query): diff --git a/django/db/backends/sqlite3/creation.py b/django/db/backends/sqlite3/creation.py index 5f55e3927c..9e660fa387 100644 --- a/django/db/backends/sqlite3/creation.py +++ b/django/db/backends/sqlite3/creation.py @@ -57,7 +57,7 @@ class DatabaseCreation(BaseDatabaseCreation): if autoclobber or confirm == 'yes': try: os.remove(test_database_name) - except Exception, e: + except Exception as e: sys.stderr.write("Got an error deleting the old test database: %s\n" % e) sys.exit(2) else: |