diff -r 2a42ca2679e2 -r 1cb54e6193a6 mercurial/wireprotov1peer.py
--- 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)