[PATCH 6 of 8] py3: make hgext/hisedit.py use absolute_import

Pulkit Goyal 7895pulkit at gmail.com
Fri May 6 12:52:31 EDT 2016


# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1462551746 -19800
#      Fri May 06 21:52:26 2016 +0530
# Node ID ee51321c1a10790e4eb0fc614f398271a39a5d0e
# Parent  35bd4701a62cf1220950741d5df602a8342cd178
py3: make hgext/hisedit.py use absolute_import

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -169,30 +169,34 @@
 
 """
 
-import pickle
+from __future__ import absolute_import
+
 import errno
 import os
+import pickle
 import sys
-
-from mercurial import bundle2
-from mercurial import cmdutil
-from mercurial import discovery
-from mercurial import error
-from mercurial import copies
-from mercurial import context
-from mercurial import destutil
-from mercurial import exchange
-from mercurial import extensions
-from mercurial import hg
-from mercurial import node
-from mercurial import repair
-from mercurial import scmutil
-from mercurial import util
-from mercurial import obsolete
-from mercurial import merge as mergemod
-from mercurial.lock import release
+from mercurial import (
+    bundle2,
+    cmdutil,
+    context,
+    copies,
+    destutil,
+    discovery,
+    error,
+    exchange,
+    extensions,
+    hg,
+    lock,
+    merge as mergemod,
+    node,
+    obsolete,
+    repair,
+    scmutil,
+    util,
+)
 from mercurial.i18n import _
 
+release = lock.release
 cmdtable = {}
 command = cmdutil.command(cmdtable)
 
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
@@ -10,7 +10,6 @@
   hgext/hgcia.py not using absolute_import
   hgext/highlight/__init__.py not using absolute_import
   hgext/highlight/highlight.py not using absolute_import
-  hgext/histedit.py not using absolute_import
   hgext/largefiles/__init__.py not using absolute_import
   hgext/largefiles/basestore.py not using absolute_import
   hgext/largefiles/lfcommands.py not using absolute_import


More information about the Mercurial-devel mailing list