openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Python3-compatible exception raising

Browse Source
This commit is contained in:
Tyler Hobbs
2014-05-02 17:36:52 -05:00
parent 24eb31ef5a
commit 2f04c9cde1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cassandra/concurrent.py
View File

@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import six
import sys import sys
from itertools import count, cycle from itertools import count, cycle
@@ -135,7 +136,10 @@ def _handle_error(error, result_index, event, session, statements, results, num_
errback=_handle_error, errback_args=args) errback=_handle_error, errback_args=args)
except Exception as exc: except Exception as exc:
if first_error is not None: if first_error is not None:
first_error.append(sys.exc_info()) if six.PY2:
first_error.append(sys.exc_info())
else:
first_error.append(exc)
event.set() event.set()
return return
else: else:
@@ -165,7 +169,10 @@ def _execute_next(result, result_index, event, session, statements, results, num
errback=_handle_error, errback_args=args) errback=_handle_error, errback_args=args)
except Exception as exc: except Exception as exc:
if first_error is not None: if first_error is not None:
first_error.append(sys.exc_info()) if six.PY2:
first_error.append(sys.exc_info())
else:
first_error.append(exc)
event.set() event.set()
return return
else: else: