Mercurial > hg
diff mercurial/wireprotov1peer.py @ 37669:1cb54e6193a6
py3: paper over differences in future exception handling
It looks like Python 3's futures library lacks set_exception_info
entirely. We'll just give up and use set_exception in that case.
# no-check-commit because the underbar naming is just saner here
Differential Revision: https://phab.mercurial-scm.org/D3336
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 13 Apr 2018 18:17:45 -0400 |
parents | 62ebfda864de |
children | 856f381ad74b |
line wrap: on
line diff
--- a/mercurial/wireprotov1peer.py Sat Apr 14 02:06:03 2018 +0530 +++ b/mercurial/wireprotov1peer.py Fri Apr 13 18:17:45 2018 -0400 @@ -209,7 +209,7 @@ try: result = fn(**pycompat.strkwargs(args)) except Exception: - f.set_exception_info(*sys.exc_info()[1:]) + pycompat.future_set_exception_info(f, sys.exc_info()[1:]) else: f.set_result(result) @@ -234,14 +234,14 @@ batchable = fn.batchable(fn.__self__, **pycompat.strkwargs(args)) except Exception: - f.set_exception_info(*sys.exc_info()[1:]) + pycompat.future_set_exception_info(f, sys.exc_info()[1:]) return # Encoded arguments and future holding remote result. try: encodedargs, fremote = next(batchable) except Exception: - f.set_exception_info(*sys.exc_info()[1:]) + pycompat.future_set_exception_info(f, sys.exc_info()[1:]) return requests.append((command, encodedargs)) @@ -304,7 +304,7 @@ try: result = next(batchable) except Exception: - f.set_exception_info(*sys.exc_info()[1:]) + pycompat.future_set_exception_info(f, sys.exc_info()[1:]) else: f.set_result(result)