diff options
author | efkin <efkin@riseup.net> | 2017-03-13 21:17:18 +0100 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2017-03-17 17:52:57 +0100 |
commit | 7562655cf4bf28a1ebd6c458334da0c166f34e61 (patch) | |
tree | 54bc2de9b71e35d56fdcc3dd1ee9642ce8fd491d /common/src/leap/soledad/common/l2db/backends/sqlite_backend.py | |
parent | ba3fcb08eafd389bdbf0ab9c59577a25c8d8126d (diff) |
[refactor] Improve python3 compatibility
With this commit all tests on py34 tox environment
are collected.
Diffstat (limited to 'common/src/leap/soledad/common/l2db/backends/sqlite_backend.py')
-rw-r--r-- | common/src/leap/soledad/common/l2db/backends/sqlite_backend.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/common/src/leap/soledad/common/l2db/backends/sqlite_backend.py b/common/src/leap/soledad/common/l2db/backends/sqlite_backend.py index 27db65af..4f7b1259 100644 --- a/common/src/leap/soledad/common/l2db/backends/sqlite_backend.py +++ b/common/src/leap/soledad/common/l2db/backends/sqlite_backend.py @@ -58,7 +58,7 @@ class SQLiteDatabase(CommonBackend): try: c.execute("SELECT value FROM u1db_config" " WHERE name = 'index_storage'") - except dbapi2.OperationalError, e: + except dbapi2.OperationalError as e: # The table does not exist yet return None, e else: @@ -668,7 +668,7 @@ class SQLiteDatabase(CommonBackend): c = self._db_handle.cursor() try: c.execute(statement, tuple(args)) - except dbapi2.OperationalError, e: + except dbapi2.OperationalError as e: raise dbapi2.OperationalError( str(e) + '\nstatement: %s\nargs: %s\n' % (statement, args)) @@ -768,7 +768,7 @@ class SQLiteDatabase(CommonBackend): c = self._db_handle.cursor() try: c.execute(statement, tuple(args)) - except dbapi2.OperationalError, e: + except dbapi2.OperationalError as e: raise dbapi2.OperationalError( str(e) + '\nstatement: %s\nargs: %s\n' % (statement, args)) @@ -798,7 +798,7 @@ class SQLiteDatabase(CommonBackend): value_fields)) try: c.execute(statement, tuple(definition)) - except dbapi2.OperationalError, e: + except dbapi2.OperationalError as e: raise dbapi2.OperationalError( str(e) + '\nstatement: %s\nargs: %s\n' % (statement, tuple(definition))) @@ -893,7 +893,10 @@ class SQLitePartialExpandDatabase(SQLiteDatabase): stored_def = self._get_index_definition(index_name) if stored_def == [x[-1] for x in definition]: return - raise errors.IndexNameTakenError, e, sys.exc_info()[2] + raise errors.IndexNameTakenError( + str(e) + + str(sys.exc_info()[2]) + ) new_fields = set( [f for f in index_expressions if f not in cur_fields]) if new_fields: |