[PATCH 2 of 8] store: use absolute_import

Gregory Szorc gregory.szorc at gmail.com
Tue Dec 22 00:00:37 CST 2015


# HG changeset patch
# User Gregory Szorc <gregory.szorc at gmail.com>
# Date 1450761597 28800
#      Mon Dec 21 21:19:57 2015 -0800
# Node ID d9a97362667295bfda1b851f8843e21516c59107
# Parent  a9d3c36324cf61e140121bbb1106672627454a18
store: use absolute_import

diff --git a/mercurial/store.py b/mercurial/store.py
--- a/mercurial/store.py
+++ b/mercurial/store.py
@@ -1,18 +1,28 @@
 # store.py - repository store handling for Mercurial
 #
 # Copyright 2008 Matt Mackall <mpm at selenic.com>
 #
 # 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 scmutil, util, parsers, error
-import os, stat, errno
+from __future__ import absolute_import
+
+import errno
+import os
+import stat
+
+from .i18n import _
+from . import (
+    error,
+    parsers,
+    scmutil,
+    util,
+)
 
 _sha = util.sha1
 
 # This avoids a collision between a file named foo and a dir named
 # foo.i or foo.d
 def _encodedir(path):
     '''
     >>> _encodedir('data/foo.i')
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
@@ -119,17 +119,16 @@
   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
   mercurial/scmposix.py not using absolute_import
   mercurial/scmutil.py not using absolute_import
   mercurial/scmwindows.py not using absolute_import
-  mercurial/store.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
   tests/get-with-headers.py requires print_function
   tests/heredoctest.py requires print_function
   tests/hypothesishelpers.py not using absolute_import
   tests/hypothesishelpers.py requires print_function
   tests/killdaemons.py not using absolute_import


More information about the Mercurial-devel mailing list