diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2016-09-26 14:16:32 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ln3.zzzcomputing.com> | 2016-09-26 14:16:32 -0400 |
| commit | f09056323e2c7b51ecdf02f8c31e7529382ed0f8 (patch) | |
| tree | 258f7621b08ddbefce2d4ccd6d5e29ff838c1810 /lib/sqlalchemy/engine/result.py | |
| parent | e9b2625753fba02358d9cb4ef1d9dd07b8761d21 (diff) | |
| parent | 7827dfb6726a682c630d66b24423582d5dc09589 (diff) | |
| download | sqlalchemy-f09056323e2c7b51ecdf02f8c31e7529382ed0f8.tar.gz | |
Merge "Handle BaseException in all _handle_dbapi_error"
Diffstat (limited to 'lib/sqlalchemy/engine/result.py')
| -rw-r--r-- | lib/sqlalchemy/engine/result.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index 7fe09b2c7..8e5d79968 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -734,7 +734,7 @@ class ResultProxy(object): """ try: return self.context.rowcount - except Exception as e: + except BaseException as e: self.connection._handle_dbapi_exception( e, None, None, self.cursor, self.context) @@ -756,7 +756,7 @@ class ResultProxy(object): """ try: return self._saved_cursor.lastrowid - except Exception as e: + except BaseException as e: self.connection._handle_dbapi_exception( e, None, None, self._saved_cursor, self.context) @@ -1120,7 +1120,7 @@ class ResultProxy(object): l = self.process_rows(self._fetchall_impl()) self._soft_close() return l - except Exception as e: + except BaseException as e: self.connection._handle_dbapi_exception( e, None, None, self.cursor, self.context) @@ -1149,7 +1149,7 @@ class ResultProxy(object): if len(l) == 0: self._soft_close() return l - except Exception as e: + except BaseException as e: self.connection._handle_dbapi_exception( e, None, None, self.cursor, self.context) @@ -1178,7 +1178,7 @@ class ResultProxy(object): else: self._soft_close() return None - except Exception as e: + except BaseException as e: self.connection._handle_dbapi_exception( e, None, None, self.cursor, self.context) @@ -1197,7 +1197,7 @@ class ResultProxy(object): try: row = self._fetchone_impl() - except Exception as e: + except BaseException as e: self.connection._handle_dbapi_exception( e, None, None, self.cursor, self.context) |