From patchwork Thu Sep 19 20:08:10 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1, of, 5, RFC, py3,
 support] commands: import hgweb.server in a way that 2to3 can rewrite
From: Augie Fackler <raf@durin42.com>
X-Patchwork-Id: 2547
Message-Id: <bc6ff6482c1da65bf928.1379621290@arthedain.pit.corp.google.com>
To: mercurial-devel@selenic.com
Date: Thu, 19 Sep 2013 16:08:10 -0400

# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1379618906 14400
#      Thu Sep 19 15:28:26 2013 -0400
# Node ID bc6ff6482c1da65bf9286c82a0b3ebcafc80f09b
# Parent  d4ed26beae0e41c86c413c69c1e6f13c32eb3d33
commands: import hgweb.server in a way that 2to3 can rewrite

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -12,7 +12,8 @@
 import hg, scmutil, util, revlog, copies, error, bookmarks
 import patch, help, encoding, templatekw, discovery
 import archival, changegroup, cmdutil, hbisect
-import sshserver, hgweb, hgweb.server, commandserver
+import sshserver, hgweb, commandserver
+from hgweb import server as hgweb_server
 import merge as mergemod
 import minirst, revset, fileset
 import dagparser, context, simplemerge, graphmod
@@ -5183,7 +5184,7 @@
     class service(object):
         def init(self):
             util.setsignalhandler()
-            self.httpd = hgweb.server.create_server(ui, app)
+            self.httpd = hgweb_server.create_server(ui, app)
 
             if opts['port'] and not ui.verbose:
                 return