[PATCH 5 of 8] convert: cvsps use absolute_import

timeless timeless at mozdev.org
Wed Mar 2 10:51:55 EST 2016


# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1456930589 0
#      Wed Mar 02 14:56:29 2016 +0000
# Node ID 441c7030734e10ada37c99049917c8f1dd3050a5
# Parent  6cd4233145879035161358f6a0f8ef40cba86af1
convert: cvsps use absolute_import

diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py
+++ b/hgext/convert/cvsps.py
@@ -4,13 +4,17 @@
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
+from __future__ import absolute_import
 
+import cPickle as pickle
 import os
 import re
-import cPickle as pickle
+
+from mercurial import (
+    hook,
+    util,
+)
 from mercurial.i18n import _
-from mercurial import hook
-from mercurial import util
 
 class logentry(object):
     '''Class logentry has the following attributes:
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
@@ -38,7 +38,6 @@
   hgext/convert/common.py not using absolute_import
   hgext/convert/convcmd.py not using absolute_import
   hgext/convert/cvs.py not using absolute_import
-  hgext/convert/cvsps.py not using absolute_import
   hgext/convert/hg.py not using absolute_import
   hgext/convert/monotone.py not using absolute_import
   hgext/convert/p4.py not using absolute_import


More information about the Mercurial-devel mailing list