# HG changeset patch # User Gregory Szorc # Date 1450761823 28800 # Node ID dde3da2246f1a4899157f739ae880120604a69a3 # Parent 029f02757c207754157e1f6ba744606d11930581 scmutil: use absolute_import diff -r 029f02757c20 -r dde3da2246f1 mercurial/scmutil.py --- a/mercurial/scmutil.py Mon Dec 21 21:21:09 2015 -0800 +++ b/mercurial/scmutil.py Mon Dec 21 21:23:43 2015 -0800 @@ -5,17 +5,34 @@ # 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 _ -from mercurial.node import wdirrev -import util, error, osutil, revset, similar, encoding, phases -import pathutil -import match as matchmod -import os, errno, re, glob, tempfile, shutil, stat +from __future__ import absolute_import + +import errno +import glob +import os +import re +import shutil +import stat +import tempfile + +from .i18n import _ +from .node import wdirrev +from . import ( + encoding, + error, + match as matchmod, + osutil, + pathutil, + phases, + revset, + similar, + util, +) if os.name == 'nt': - import scmwindows as scmplatform + from . import scmwindows as scmplatform else: - import scmposix as scmplatform + from . import scmposix as scmplatform systemrcpath = scmplatform.systemrcpath userrcpath = scmplatform.userrcpath diff -r 029f02757c20 -r dde3da2246f1 tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t Mon Dec 21 21:21:09 2015 -0800 +++ b/tests/test-check-py3-compat.t Mon Dec 21 21:23:43 2015 -0800 @@ -122,7 +122,6 @@ mercurial/pvec.py not using absolute_import mercurial/py3kcompat.py not using absolute_import mercurial/scmposix.py not using absolute_import - mercurial/scmutil.py not using absolute_import setup.py not using absolute_import tests/filterpyflakes.py requires print_function tests/generate-working-copy-states.py requires print_function