# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2016-04-15 21:29:36 # Node ID 2d433fa7ff44a50e791c693bbd3f390117f3bd8e # Parent 0411b7998d9b755666d816d589dbb5478e31faaf 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 . +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.