Mercurial > public > mercurial-scm > hg-stable
diff mercurial/pycompat.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 | 8da30ceae88f |
children | 8fb9985382be |
line wrap: on
line diff
--- a/mercurial/pycompat.py Sat Apr 14 02:06:03 2018 +0530 +++ b/mercurial/pycompat.py Fri Apr 13 18:17:45 2018 -0400 @@ -28,6 +28,9 @@ import xmlrpclib from .thirdparty.concurrent import futures + + def future_set_exception_info(f, exc_info): + f.set_exception_info(*exc_info) else: import concurrent.futures as futures import http.cookiejar as cookielib @@ -37,6 +40,9 @@ import socketserver import xmlrpc.client as xmlrpclib + def future_set_exception_info(f, exc_info): + f.set_exception(exc_info[0]) + empty = _queue.Empty queue = _queue.Queue