From patchwork Fri Sep 20 14:23:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [06, of, 13, V2, py3, support] commands: move import of hgweb.server to its own line for 2to3 compat From: Augie Fackler X-Patchwork-Id: 2552 Message-Id: To: mercurial-devel@selenic.com Date: Fri, 20 Sep 2013 10:23:44 -0400 # HG changeset patch # User Augie Fackler # Date 1379686580 14400 # Fri Sep 20 10:16:20 2013 -0400 # Node ID f8df24eec452d382fc35c2061380daf32f95e4ef # Parent 555ffd018f135ea23418543b2c9918a5e9a6f218 commands: move import of hgweb.server to its own line for 2to3 compat 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 +import hgweb.server import merge as mergemod import minirst, revset, fileset import dagparser, context, simplemerge, graphmod