Mercurial > hg-stable
changeset 28927:2d433fa7ff44
tests: make test-simplemerge use absolute_import
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sat, 16 Apr 2016 02:59:36 +0530 |
| parents | 0411b7998d9b |
| children | 59481bfdb7f3 |
| files | tests/test-check-py3-compat.t tests/test-simplemerge.py |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-check-py3-compat.t Thu Apr 14 01:37:29 2016 -0700 +++ b/tests/test-check-py3-compat.t Sat Apr 16 02:59:36 2016 +0530 @@ -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
--- a/tests/test-simplemerge.py Thu Apr 14 01:37:29 2016 -0700 +++ b/tests/test-simplemerge.py Sat Apr 16 02:59:36 2016 +0530 @@ -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.