--- a/mercurial/httppeer.py	Sun Aug 18 00:45:33 2019 +0300
+++ b/mercurial/httppeer.py	Sun Aug 18 02:28:42 2019 +0300
@@ -16,9 +16,6 @@
 import weakref
 
 from .i18n import _
-from .interfaces import (
-    repository,
-)
 from . import (
     bundle2,
     error,
@@ -33,9 +30,12 @@
     wireprotov2peer,
     wireprotov2server,
 )
+from .interfaces import (
+    repository,
+    util as interfaceutil,
+)
 from .utils import (
     cborutil,
-    interfaceutil,
     stringutil,
 )