--- a/mercurial/httppeer.py Mon Apr 23 21:13:19 2018 +0900
+++ b/mercurial/httppeer.py Sun Apr 22 11:54:10 2018 -0700
@@ -20,9 +20,6 @@
from .thirdparty import (
cbor,
)
-from .thirdparty.zope import (
- interface as zi,
-)
from . import (
bundle2,
error,
@@ -38,6 +35,9 @@
wireprotov2peer,
wireprotov2server,
)
+from .utils import (
+ interfaceutil,
+)
httplib = util.httplib
urlerr = util.urlerr
@@ -582,7 +582,7 @@
# will resolve to Future.result.
return self.result(timeout)
-@zi.implementer(repository.ipeercommandexecutor)
+@interfaceutil.implementer(repository.ipeercommandexecutor)
class httpv2executor(object):
def __init__(self, ui, opener, requestbuilder, apiurl, descriptor):
self._ui = ui
@@ -731,8 +731,9 @@
pass
# TODO implement interface for version 2 peers
-@zi.implementer(repository.ipeerconnection, repository.ipeercapabilities,
- repository.ipeerrequests)
+@interfaceutil.implementer(repository.ipeerconnection,
+ repository.ipeercapabilities,
+ repository.ipeerrequests)
class httpv2peer(object):
def __init__(self, ui, repourl, apipath, opener, requestbuilder,
apidescriptor):