tests: make test-simplemerge use absolute_import

This commit is contained in:
Pulkit Goyal 2016-04-16 02:59:36 +05:30
parent 8727b619f9
commit 7e32ca8304
2 changed files with 9 additions and 4 deletions

View File

@ -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

View File

@ -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/>.
import unittest
from unittest import TestCase
from mercurial import util, simplemerge, error
from __future__ import absolute_import
import unittest
from mercurial import (
error,
simplemerge,
util,
)
TestCase = unittest.TestCase
# bzr compatible interface, for the tests
class Merge3(simplemerge.Merge3Text):
"""3-way merge of texts.