changeset 37628 | 8da30ceae88f |
parent 37099 | 6ca5f825a0ca |
child 37669 | 1cb54e6193a6 |
--- a/mercurial/pycompat.py Mon Apr 09 12:27:52 2018 -0700 +++ b/mercurial/pycompat.py Mon Apr 09 12:28:57 2018 -0700 @@ -26,7 +26,10 @@ import Queue as _queue import SocketServer as socketserver import xmlrpclib + + from .thirdparty.concurrent import futures else: + import concurrent.futures as futures import http.cookiejar as cookielib import http.client as httplib import pickle