Mercurial > hg-stable

changeset 19757:ff00839e8bb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: import hgweb.server in a way that 2to3 can rewrite
author Augie Fackler <raf@durin42.com>
date Thu, 19 Sep 2013 15:28:26 -0400
parents 54981b899406
children 14c4f605f0fc
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Sep 06 13:30:58 2013 +0400
+++ b/mercurial/commands.py	Thu Sep 19 15:28:26 2013 -0400
@@ -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