[PATCH 1 of 8] tests: make test-simplemerge use absolute_import

Pulkit Goyal 7895pulkit at gmail.com
Fri Apr 15 18:37:39 EDT 2016


# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1460755776 -19800
#      Sat Apr 16 02:59:36 2016 +0530
# Node ID 90a2e5183954eae72bd8f0fc1134e8d052f23a15
# Parent  d9539959167df7cb3acd08c4ab53d8e8a7f027cb
tests: make test-simplemerge use absolute_import

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
@@ -61,7 +61,6 @@
   tests/test-lrucachedict.py requires print_function
   tests/test-manifest.py not using absolute_import
   tests/test-pathencode.py not using absolute_import
-  tests/test-simplemerge.py not using absolute_import
   tests/test-trusted.py requires print_function
 
 #if py3exe
diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py
--- a/tests/test-simplemerge.py
+++ b/tests/test-simplemerge.py
@@ -13,10 +13,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import absolute_import
+
 import unittest
-from unittest import TestCase
-from mercurial import util, simplemerge, error
+from mercurial import (
+    error,
+    simplemerge,
+    util,
+)
 
+TestCase = unittest.TestCase
 # bzr compatible interface, for the tests
 class Merge3(simplemerge.Merge3Text):
     """3-way merge of texts.


More information about the Mercurial-devel mailing list