# HG changeset patch # User Gregory Szorc # Date 2015-12-22 05:26:14 # Node ID 0d7635dca69105be86df4185f8bd05069370874d # Parent 39087ee8883556e234e1143a8ca931a12456d6f8 mdiff: use absolute_import diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -5,9 +5,20 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -from i18n import _ -import bdiff, mpatch, util, base85, error -import re, struct, zlib +from __future__ import absolute_import + +import re +import struct +import zlib + +from .i18n import _ +from . import ( + base85, + bdiff, + error, + mpatch, + util, +) def splitnewlines(text): '''like str.splitlines, but only split on newlines.''' diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t +++ b/tests/test-check-py3-compat.t @@ -117,7 +117,6 @@ mercurial/lsprofcalltree.py requires print_function mercurial/mail.py requires print_function mercurial/manifest.py not using absolute_import - mercurial/mdiff.py not using absolute_import mercurial/patch.py not using absolute_import mercurial/pvec.py not using absolute_import mercurial/py3kcompat.py not using absolute_import