diff -r e1d26630443d -r 6041fb8f2da8 mercurial/util.py
--- a/mercurial/util.py	Mon Apr 04 15:39:13 2016 +0200
+++ b/mercurial/util.py	Wed Apr 06 20:00:49 2016 +0000
@@ -43,8 +43,15 @@
     i18n,
     osutil,
     parsers,
+    pycompat,
 )
 
+for attr in (
+    'empty',
+    'queue',
+):
+    globals()[attr] = getattr(pycompat, attr)
+
 if os.name == 'nt':
     from . import windows as platform
 else: