diff -r 670eb4fa1b86 -r 8fb9985382be mercurial/pycompat.py
--- a/mercurial/pycompat.py	Sat May 05 18:41:51 2018 -0700
+++ b/mercurial/pycompat.py	Sat May 05 18:35:16 2018 -0700
@@ -23,7 +23,7 @@
     import cookielib
     import cPickle as pickle
     import httplib
-    import Queue as _queue
+    import Queue as queue
     import SocketServer as socketserver
     import xmlrpclib
 
@@ -36,16 +36,13 @@
     import http.cookiejar as cookielib
     import http.client as httplib
     import pickle
-    import queue as _queue
+    import queue as queue
     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
-
 def identity(a):
     return a