--- a/hgext/zeroconf/__init__.py Sat Feb 27 22:34:18 2016 -0800
+++ b/hgext/zeroconf/__init__.py Tue Mar 01 13:48:25 2016 -0500
@@ -34,7 +34,7 @@
encoding,
extensions,
hg,
- ui,
+ ui as uimod,
)
from mercurial.hgweb import (
server as servermod
@@ -206,8 +206,8 @@
extensions.wrapfunction(dispatch, '_runcommand', cleanupafterdispatch)
-extensions.wrapfunction(ui.ui, 'config', config)
-extensions.wrapfunction(ui.ui, 'configitems', configitems)
-extensions.wrapfunction(ui.ui, 'configsuboptions', configsuboptions)
+extensions.wrapfunction(uimod.ui, 'config', config)
+extensions.wrapfunction(uimod.ui, 'configitems', configitems)
+extensions.wrapfunction(uimod.ui, 'configsuboptions', configsuboptions)
extensions.wrapfunction(hg, 'defaultdest', defaultdest)
extensions.wrapfunction(servermod, 'create_server', zc_create_server)