diff -r eac72c1e1e0d -r 37fcfe52c68c mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py Sun Nov 01 15:09:35 2015 +0900 +++ b/mercurial/hgweb/webutil.py Sat Oct 31 22:07:40 2015 +0900 @@ -6,16 +6,32 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -import os, copy +from __future__ import absolute_import + +import copy +import difflib +import os import re -from mercurial import match, patch, error, util, pathutil, context -from mercurial import ui as uimod -from mercurial.i18n import _ -from mercurial.node import hex, nullid, short -from mercurial import templatefilters -from common import ErrorResponse, paritygen -from common import HTTP_NOT_FOUND -import difflib + +from ..i18n import _ +from ..node import hex, nullid, short + +from .common import ( + ErrorResponse, + HTTP_NOT_FOUND, + paritygen, +) + +from .. import ( + context, + error, + match, + patch, + pathutil, + templatefilters, + ui as uimod, + util, +) def up(p): if p[0] != "/":