diff --git a/tests/test-annotate.t b/tests/test-annotate.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1hbm5vdGF0ZS50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1hbm5vdGF0ZS50 100644 --- a/tests/test-annotate.t +++ b/tests/test-annotate.t @@ -478,7 +478,6 @@ and its ancestor by overriding "repo._filecommit". $ cat > ../legacyrepo.py <<EOF - > from __future__ import absolute_import > from mercurial import commit, error, extensions > def _filecommit(orig, repo, fctx, manifest1, manifest2, > linkrev, tr, includecopymeta, ms): diff --git a/tests/test-arbitraryfilectx.t b/tests/test-arbitraryfilectx.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1hcmJpdHJhcnlmaWxlY3R4LnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1hcmJpdHJhcnlmaWxlY3R4LnQ= 100644 --- a/tests/test-arbitraryfilectx.t +++ b/tests/test-arbitraryfilectx.t @@ -1,6 +1,5 @@ Setup: $ cat > eval.py <<EOF - > from __future__ import absolute_import > import filecmp > from mercurial import commands, context, pycompat, registrar > cmdtable = {} diff --git a/tests/test-archive.t b/tests/test-archive.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1hcmNoaXZlLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1hcmNoaXZlLnQ= 100644 --- a/tests/test-archive.t +++ b/tests/test-archive.t @@ -320,7 +320,6 @@ $ TIP=`hg id -v | cut -f1 -d' '` $ QTIP=`hg id -q` $ cat > getarchive.py <<EOF - > from __future__ import absolute_import > import os > import sys > from mercurial import ( @@ -455,7 +454,6 @@ > done $ cat > md5comp.py <<EOF - > from __future__ import absolute_import, print_function > import hashlib > import sys > f1, f2 = sys.argv[1:3] @@ -617,7 +615,6 @@ $ hg -R repo add repo/a $ hg -R repo commit -m '#0' -d '456789012 21600' $ cat > show_mtime.py <<EOF - > from __future__ import absolute_import, print_function > import os > import sys > print(int(os.stat(sys.argv[1]).st_mtime)) diff --git a/tests/test-bisect.t b/tests/test-bisect.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1iaXNlY3QudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1iaXNlY3QudA== 100644 --- a/tests/test-bisect.t +++ b/tests/test-bisect.t @@ -462,7 +462,6 @@ $ cat > script.py <<EOF > #!$PYTHON - > from __future__ import absolute_import > import sys > from mercurial import hg, ui as uimod > repo = hg.repository(uimod.ui.load(), b'.') diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1ibGFja2JveC50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1ibGFja2JveC50 100644 --- a/tests/test-blackbox.t +++ b/tests/test-blackbox.t @@ -403,7 +403,6 @@ when using chg, blackbox.log should get rotated correctly $ cat > $TESTTMP/noop.py << EOF - > from __future__ import absolute_import > import time > from mercurial import registrar, scmutil > cmdtable = {} @@ -463,7 +462,6 @@ blackbox should work if repo.ui.log is not called (issue5518) $ cat > $TESTTMP/raise.py << EOF - > from __future__ import absolute_import > from mercurial import registrar, scmutil > cmdtable = {} > command = registrar.command(cmdtable) diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1ib29rbWFya3MudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1ib29rbWFya3MudA== 100644 --- a/tests/test-bookmarks.t +++ b/tests/test-bookmarks.t @@ -1069,7 +1069,6 @@ $ echo a > a $ cat > $TESTTMP/pausefinalize.py <<EOF - > from __future__ import absolute_import > import os > import time > from mercurial import extensions, localrepo diff --git a/tests/test-bugzilla.t b/tests/test-bugzilla.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1idWd6aWxsYS50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1idWd6aWxsYS50 100644 --- a/tests/test-bugzilla.t +++ b/tests/test-bugzilla.t @@ -1,7 +1,6 @@ mock bugzilla driver for testing template output: $ cat <<EOF > bzmock.py - > from __future__ import absolute_import > from mercurial import extensions > from mercurial import pycompat > from mercurial import registrar diff --git a/tests/test-bundle.t b/tests/test-bundle.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1idW5kbGUudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1idW5kbGUudA== 100644 --- a/tests/test-bundle.t +++ b/tests/test-bundle.t @@ -466,7 +466,6 @@ transaction) $ cat > $TESTTMP/showtip.py <<EOF - > from __future__ import absolute_import > > def showtip(ui, repo, hooktype, **kwargs): > ui.warn(b'%s: %s\n' % (hooktype, repo[b'tip'].hex()[:12])) diff --git a/tests/test-bundle2-pushback.t b/tests/test-bundle2-pushback.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1idW5kbGUyLXB1c2hiYWNrLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1idW5kbGUyLXB1c2hiYWNrLnQ= 100644 --- a/tests/test-bundle2-pushback.t +++ b/tests/test-bundle2-pushback.t @@ -3,7 +3,6 @@ > Current bundle2 implementation doesn't provide a way to generate those > parts, so they must be created by extensions. > """ - > from __future__ import absolute_import > from mercurial import bundle2, exchange, pushkey, util > def _newhandlechangegroup(op, inpart): > """This function wraps the changegroup part handler for getbundle. diff --git a/tests/test-check-help.t b/tests/test-check-help.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1jaGVjay1oZWxwLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1jaGVjay1oZWxwLnQ= 100644 --- a/tests/test-check-help.t +++ b/tests/test-check-help.t @@ -3,7 +3,6 @@ $ . "$TESTDIR/helpers-testrepo.sh" $ cat <<'EOF' > scanhelptopics.py - > from __future__ import absolute_import, print_function > import re > import sys > if sys.platform == "win32": diff --git a/tests/test-chg.t b/tests/test-chg.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1jaGcudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1jaGcudA== 100644 --- a/tests/test-chg.t +++ b/tests/test-chg.t @@ -132,7 +132,6 @@ > EOF $ cat > $TESTTMP/fakepager.py <<EOF - > from __future__ import absolute_import > import sys > import time > for line in iter(sys.stdin.readline, ''): diff --git a/tests/test-commit-interactive.t b/tests/test-commit-interactive.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1jb21taXQtaW50ZXJhY3RpdmUudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1jb21taXQtaW50ZXJhY3RpdmUudA== 100644 --- a/tests/test-commit-interactive.t +++ b/tests/test-commit-interactive.t @@ -938,7 +938,6 @@ $ export LANGUAGE $ cat > $TESTTMP/escape.py <<EOF - > from __future__ import absolute_import > from mercurial import ( > pycompat, > ) diff --git a/tests/test-commit.t b/tests/test-commit.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1jb21taXQudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1jb21taXQudA== 100644 --- a/tests/test-commit.t +++ b/tests/test-commit.t @@ -645,7 +645,6 @@ verify pathauditor blocks evil filepaths $ cat > evil-commit.py <<EOF - > from __future__ import absolute_import > from mercurial import context, hg, ui as uimod > notrc = u".h\u200cg".encode('utf-8') + b'/hgrc' > u = uimod.ui.load() @@ -671,7 +670,6 @@ $ hg rollback -f repository tip rolled back to revision 2 (undo commit) $ cat > evil-commit.py <<EOF - > from __future__ import absolute_import > from mercurial import context, hg, ui as uimod > notrc = b"HG~1/hgrc" > u = uimod.ui.load() @@ -691,7 +689,6 @@ $ hg rollback -f repository tip rolled back to revision 2 (undo commit) $ cat > evil-commit.py <<EOF - > from __future__ import absolute_import > from mercurial import context, hg, ui as uimod > notrc = b"HG8B6C~2/hgrc" > u = uimod.ui.load() diff --git a/tests/test-context-metadata.t b/tests/test-context-metadata.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1jb250ZXh0LW1ldGFkYXRhLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1jb250ZXh0LW1ldGFkYXRhLnQ= 100644 --- a/tests/test-context-metadata.t +++ b/tests/test-context-metadata.t @@ -12,7 +12,6 @@ $ hg commit -m 'Remove A' $ cat > metaedit.py <<EOF - > from __future__ import absolute_import > from mercurial import context, pycompat, registrar > cmdtable = {} > command = registrar.command(cmdtable) diff --git a/tests/test-convert-clonebranches.t b/tests/test-convert-clonebranches.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1jb252ZXJ0LWNsb25lYnJhbmNoZXMudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1jb252ZXJ0LWNsb25lYnJhbmNoZXMudA== 100644 --- a/tests/test-convert-clonebranches.t +++ b/tests/test-convert-clonebranches.t @@ -31,7 +31,6 @@ Miss perl... sometimes $ cat > filter.py <<EOF - > from __future__ import absolute_import > import re > import sys > diff --git a/tests/test-dirstate.t b/tests/test-dirstate.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1kaXJzdGF0ZS50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1kaXJzdGF0ZS50 100644 --- a/tests/test-dirstate.t +++ b/tests/test-dirstate.t @@ -77,7 +77,6 @@ coherent (issue4353) $ cat > ../dirstateexception.py <<EOF - > from __future__ import absolute_import > from mercurial import ( > error, > extensions, diff --git a/tests/test-eol.t b/tests/test-eol.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1lb2wudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1lb2wudA== 100644 --- a/tests/test-eol.t +++ b/tests/test-eol.t @@ -8,7 +8,6 @@ Set up helpers $ cat > switch-eol.py <<'EOF' - > from __future__ import absolute_import > import os > import sys > try: diff --git a/tests/test-extension.t b/tests/test-extension.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1leHRlbnNpb24udA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1leHRlbnNpb24udA== 100644 --- a/tests/test-extension.t +++ b/tests/test-extension.t @@ -150,7 +150,6 @@ Check that extensions are loaded in phases: $ cat > foo.py <<EOF - > from __future__ import print_function > import os > from mercurial import exthelper > from mercurial.utils import procutil @@ -295,7 +294,6 @@ $ echo "s = 'libroot/mod/ambig.py'" > $TESTTMP/libroot/mod/ambig.py $ cat > $TESTTMP/libroot/mod/ambigabs.py <<NO_CHECK_EOF - > from __future__ import absolute_import, print_function > import ambig # should load "libroot/ambig.py" > s = ambig.s > NO_CHECK_EOF @@ -311,7 +309,6 @@ #if no-py3 $ cat > $TESTTMP/libroot/mod/ambigrel.py <<NO_CHECK_EOF - > from __future__ import print_function > import ambig # should load "libroot/mod/ambig.py" > s = ambig.s > NO_CHECK_EOF @@ -340,7 +337,6 @@ > s = b'this is extroot.sub1.baz' > NO_CHECK_EOF $ cat > $TESTTMP/extroot/__init__.py <<NO_CHECK_EOF - > from __future__ import absolute_import > s = b'this is extroot.__init__' > from . import foo > def extsetup(ui): @@ -453,7 +449,6 @@ > detail = b"this is extlibroot.recursedown.abs.used" > NO_CHECK_EOF $ cat > $TESTTMP/extlibroot/recursedown/abs/__init__.py <<NO_CHECK_EOF - > from __future__ import absolute_import > from extlibroot.recursedown.abs.used import detail > NO_CHECK_EOF @@ -467,7 +462,6 @@ > NO_CHECK_EOF $ cat > $TESTTMP/extlibroot/recursedown/__init__.py <<NO_CHECK_EOF - > from __future__ import absolute_import > from extlibroot.recursedown.abs import detail as absdetail > from .legacy import detail as legacydetail > NO_CHECK_EOF @@ -481,7 +475,6 @@ > detail = b"this is extlibroot.shadowing.used" > NO_CHECK_EOF $ cat > $TESTTMP/extlibroot/shadowing/proxied.py <<NO_CHECK_EOF - > from __future__ import absolute_import > from extlibroot.shadowing.used import detail > NO_CHECK_EOF $ cat > $TESTTMP/extlibroot/shadowing/__init__.py <<NO_CHECK_EOF @@ -485,7 +478,6 @@ > from extlibroot.shadowing.used import detail > NO_CHECK_EOF $ cat > $TESTTMP/extlibroot/shadowing/__init__.py <<NO_CHECK_EOF - > from __future__ import absolute_import > from .used import detail as used > NO_CHECK_EOF @@ -514,7 +506,6 @@ > detail = b"this is absextroot.relimportee" > NO_CHECK_EOF $ cat > $TESTTMP/absextroot/xsub1/xsub2/relimporter.py <<NO_CHECK_EOF - > from __future__ import absolute_import > from mercurial import pycompat > from ... import relimportee > detail = b"this relimporter imports %r" % ( @@ -525,7 +516,6 @@ runtime. $ cat > $TESTTMP/absextroot/absolute.py << NO_CHECK_EOF - > from __future__ import absolute_import > > # import extension local modules absolutely (level = 0) > from absextroot.xsub1.xsub2 import used, unused @@ -539,7 +529,6 @@ > NO_CHECK_EOF $ cat > $TESTTMP/absextroot/relative.py << NO_CHECK_EOF - > from __future__ import absolute_import > > # import extension local modules relatively (level == 1) > from .xsub1.xsub2 import used, unused @@ -559,7 +548,6 @@ Setup main procedure of extension. $ cat > $TESTTMP/absextroot/__init__.py <<NO_CHECK_EOF - > from __future__ import absolute_import > from mercurial import registrar > cmdtable = {} > command = registrar.command(cmdtable) @@ -1925,7 +1913,6 @@ $ hg init $TESTTMP/opt-unicode-default $ cat > $TESTTMP/test_unicode_default_value.py << EOF - > from __future__ import print_function > from mercurial import registrar > cmdtable = {} > command = registrar.command(cmdtable) diff --git a/tests/test-fastannotate-hg.t b/tests/test-fastannotate-hg.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1mYXN0YW5ub3RhdGUtaGcudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1mYXN0YW5ub3RhdGUtaGcudA== 100644 --- a/tests/test-fastannotate-hg.t +++ b/tests/test-fastannotate-hg.t @@ -481,7 +481,6 @@ and its ancestor by overriding "repo._filecommit". $ cat > ../legacyrepo.py <<EOF - > from __future__ import absolute_import > from mercurial import commit, error, extensions > def _filecommit(orig, repo, fctx, manifest1, manifest2, > linkrev, tr, includecopymeta, ms): diff --git a/tests/test-filebranch.t b/tests/test-filebranch.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1maWxlYnJhbmNoLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1maWxlYnJhbmNoLnQ= 100644 --- a/tests/test-filebranch.t +++ b/tests/test-filebranch.t @@ -2,7 +2,6 @@ when we do a merge. $ cat <<EOF > merge - > from __future__ import print_function > import sys, os > print("merging for", os.path.basename(sys.argv[1])) > EOF diff --git a/tests/test-fncache.t b/tests/test-fncache.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1mbmNhY2hlLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1mbmNhY2hlLnQ= 100644 --- a/tests/test-fncache.t +++ b/tests/test-fncache.t @@ -4,7 +4,6 @@ does not break $ cat > chunksize.py <<EOF - > from __future__ import absolute_import > from mercurial import store > store.fncache_chunksize = 1 > EOF @@ -232,7 +231,6 @@ Aborting lock does not prevent fncache writes $ cat > exceptionext.py <<EOF - > from __future__ import absolute_import > import os > from mercurial import commands, error, extensions > @@ -279,7 +277,6 @@ Aborting transaction prevents fncache change $ cat > ../exceptionext.py <<EOF - > from __future__ import absolute_import > import os > from mercurial import commands, error, extensions, localrepo > @@ -315,7 +312,6 @@ Aborted transactions can be recovered later $ cat > ../exceptionext.py <<EOF - > from __future__ import absolute_import > import os > from mercurial import ( > commands, @@ -483,7 +479,6 @@ changesets that only contain changes to existing files: $ cat > fncacheloadwarn.py << EOF - > from __future__ import absolute_import > from mercurial import extensions, localrepo > > def extsetup(ui): diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1oYXJkbGlua3MudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1oYXJkbGlua3MudA== 100644 --- a/tests/test-hardlinks.t +++ b/tests/test-hardlinks.t @@ -1,7 +1,6 @@ #require hardlink reporevlogstore $ cat > nlinks.py <<EOF - > from __future__ import print_function > import sys > from mercurial import pycompat, util > for f in sorted(sys.stdin.readlines()): @@ -17,7 +16,6 @@ Some implementations of cp can't create hardlinks (replaces 'cp -al' on Linux): $ cat > linkcp.py <<EOF - > from __future__ import absolute_import > import sys > from mercurial import pycompat, util > util.copyfiles(pycompat.fsencode(sys.argv[1]), diff --git a/tests/test-help.t b/tests/test-help.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1oZWxwLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1oZWxwLnQ= 100644 --- a/tests/test-help.t +++ b/tests/test-help.t @@ -1792,7 +1792,6 @@ > > This paragraph is never omitted, too (for extension) > ''' - > from __future__ import absolute_import > from mercurial import commands, help > testtopic = br"""This paragraph is never omitted (for topic). > diff --git a/tests/test-hgweb-no-path-info.t b/tests/test-hgweb-no-path-info.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1oZ3dlYi1uby1wYXRoLWluZm8udA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1oZ3dlYi1uby1wYXRoLWluZm8udA== 100644 --- a/tests/test-hgweb-no-path-info.t +++ b/tests/test-hgweb-no-path-info.t @@ -15,7 +15,6 @@ summary: test $ cat > request.py <<EOF - > from __future__ import absolute_import > import os > import sys > from mercurial import ( diff --git a/tests/test-hgweb-no-request-uri.t b/tests/test-hgweb-no-request-uri.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1oZ3dlYi1uby1yZXF1ZXN0LXVyaS50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1oZ3dlYi1uby1yZXF1ZXN0LXVyaS50 100644 --- a/tests/test-hgweb-no-request-uri.t +++ b/tests/test-hgweb-no-request-uri.t @@ -15,7 +15,6 @@ summary: test $ cat > request.py <<EOF - > from __future__ import absolute_import > import os > import sys > from mercurial import ( diff --git a/tests/test-hgweb-non-interactive.t b/tests/test-hgweb-non-interactive.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1oZ3dlYi1ub24taW50ZXJhY3RpdmUudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1oZ3dlYi1ub24taW50ZXJhY3RpdmUudA== 100644 --- a/tests/test-hgweb-non-interactive.t +++ b/tests/test-hgweb-non-interactive.t @@ -7,7 +7,6 @@ $ hg add bar $ hg commit -m "test" $ cat > request.py <<EOF - > from __future__ import absolute_import > import os > import sys > from mercurial import ( diff --git a/tests/test-hook.t b/tests/test-hook.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1ob29rLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1ob29rLnQ= 100644 --- a/tests/test-hook.t +++ b/tests/test-hook.t @@ -831,7 +831,6 @@ $ cd "$TESTTMP/b" $ cat > hooktests.py <<EOF - > from __future__ import print_function > from mercurial import ( > error, > pycompat, diff --git a/tests/test-impexp-branch.t b/tests/test-impexp-branch.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1pbXBleHAtYnJhbmNoLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1pbXBleHAtYnJhbmNoLnQ= 100644 --- a/tests/test-impexp-branch.t +++ b/tests/test-impexp-branch.t @@ -2,7 +2,6 @@ $ echo 'strip =' >> $HGRCPATH $ cat >findbranch.py <<EOF - > from __future__ import absolute_import > import re > import sys > diff --git a/tests/test-import.t b/tests/test-import.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1pbXBvcnQudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1pbXBvcnQudA== 100644 --- a/tests/test-import.t +++ b/tests/test-import.t @@ -71,7 +71,6 @@ regardless of the commit message in the patch) $ cat > dummypatch.py <<EOF - > from __future__ import print_function > print('patching file a') > open('a', 'wb').write(b'line2\n') > EOF diff --git a/tests/test-imports-checker.t b/tests/test-imports-checker.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1pbXBvcnRzLWNoZWNrZXIudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1pbXBvcnRzLWNoZWNrZXIudA== 100644 --- a/tests/test-imports-checker.t +++ b/tests/test-imports-checker.t @@ -16,8 +16,7 @@ $ touch testpackage/__init__.py $ cat > testpackage/multiple.py << EOF - > from __future__ import absolute_import > import os, sys > EOF $ cat > testpackage/unsorted.py << EOF @@ -20,10 +19,9 @@ > import os, sys > EOF $ cat > testpackage/unsorted.py << EOF - > from __future__ import absolute_import > import sys > import os > EOF $ cat > testpackage/stdafterlocal.py << EOF @@ -25,11 +23,10 @@ > import sys > import os > EOF $ cat > testpackage/stdafterlocal.py << EOF - > from __future__ import absolute_import > from . import unsorted > import os > EOF $ cat > testpackage/requirerelative.py << EOF @@ -31,10 +28,9 @@ > from . import unsorted > import os > EOF $ cat > testpackage/requirerelative.py << EOF - > from __future__ import absolute_import > import testpackage.unsorted > EOF $ cat > testpackage/importalias.py << EOF @@ -37,9 +33,8 @@ > import testpackage.unsorted > EOF $ cat > testpackage/importalias.py << EOF - > from __future__ import absolute_import > import ui > EOF $ cat > testpackage/relativestdlib.py << EOF @@ -42,9 +37,8 @@ > import ui > EOF $ cat > testpackage/relativestdlib.py << EOF - > from __future__ import absolute_import > from .. import os > EOF $ cat > testpackage/stdlibfrom.py << EOF @@ -47,9 +41,8 @@ > from .. import os > EOF $ cat > testpackage/stdlibfrom.py << EOF - > from __future__ import absolute_import > from collections import abc > EOF $ cat > testpackage/symbolimport.py << EOF @@ -52,9 +45,8 @@ > from collections import abc > EOF $ cat > testpackage/symbolimport.py << EOF - > from __future__ import absolute_import > from .unsorted import foo > EOF $ cat > testpackage/latesymbolimport.py << EOF @@ -57,10 +49,9 @@ > from .unsorted import foo > EOF $ cat > testpackage/latesymbolimport.py << EOF - > from __future__ import absolute_import > from . import unsorted > from mercurial.node import hex > EOF $ cat > testpackage/multiplegroups.py << EOF @@ -62,12 +53,11 @@ > from . import unsorted > from mercurial.node import hex > EOF $ cat > testpackage/multiplegroups.py << EOF - > from __future__ import absolute_import > from . import unsorted > from . import more > EOF $ mkdir testpackage/subpackage $ cat > testpackage/subpackage/levelpriority.py << EOF @@ -68,13 +58,12 @@ > from . import unsorted > from . import more > EOF $ mkdir testpackage/subpackage $ cat > testpackage/subpackage/levelpriority.py << EOF - > from __future__ import absolute_import > from . import foo > from .. import parent > EOF $ touch testpackage/subpackage/foo.py $ cat > testpackage/subpackage/__init__.py << EOF @@ -75,11 +64,10 @@ > from . import foo > from .. import parent > EOF $ touch testpackage/subpackage/foo.py $ cat > testpackage/subpackage/__init__.py << EOF - > from __future__ import absolute_import > from . import levelpriority # should not cause cycle > EOF $ cat > testpackage/subpackage/localimport.py << EOF @@ -82,8 +70,7 @@ > from . import levelpriority # should not cause cycle > EOF $ cat > testpackage/subpackage/localimport.py << EOF - > from __future__ import absolute_import > from . import foo > def bar(): > # should not cause "higher-level import should come first" @@ -94,8 +81,7 @@ > EOF $ cat > testpackage/importmodulefromsub.py << EOF - > from __future__ import absolute_import > from .subpackage import foo # not a "direct symbol import" > EOF $ cat > testpackage/importsymbolfromsub.py << EOF @@ -98,9 +84,8 @@ > from .subpackage import foo # not a "direct symbol import" > EOF $ cat > testpackage/importsymbolfromsub.py << EOF - > from __future__ import absolute_import > from .subpackage import foo, nonmodule > EOF $ cat > testpackage/sortedentries.py << EOF @@ -103,8 +88,7 @@ > from .subpackage import foo, nonmodule > EOF $ cat > testpackage/sortedentries.py << EOF - > from __future__ import absolute_import > from . import ( > foo, > bar, @@ -112,8 +96,7 @@ > EOF $ cat > testpackage/importfromalias.py << EOF - > from __future__ import absolute_import > from . import ui > EOF $ cat > testpackage/importfromrelative.py << EOF @@ -116,8 +99,7 @@ > from . import ui > EOF $ cat > testpackage/importfromrelative.py << EOF - > from __future__ import absolute_import > from testpackage.unsorted import foo > EOF @@ -125,7 +107,6 @@ $ touch testpackage2/__init__.py $ cat > testpackage2/latesymbolimport.py << EOF - > from __future__ import absolute_import > from testpackage import unsorted > from mercurial.node import hex > EOF @@ -137,9 +118,8 @@ $ touch email/__init__.py $ touch email/errors.py $ cat > email/utils.py << EOF - > from __future__ import absolute_import > from . import errors > EOF $ "$PYTHON" "$import_checker" testpackage*/*.py testpackage/subpackage/*.py \ > email/*.py @@ -141,25 +121,25 @@ > from . import errors > EOF $ "$PYTHON" "$import_checker" testpackage*/*.py testpackage/subpackage/*.py \ > email/*.py - testpackage/importalias.py:2: ui module must be "as" aliased to uimod - testpackage/importfromalias.py:2: ui from testpackage must be "as" aliased to uimod - testpackage/importfromrelative.py:2: import should be relative: testpackage.unsorted - testpackage/importfromrelative.py:2: direct symbol import foo from testpackage.unsorted - testpackage/importsymbolfromsub.py:2: direct symbol import nonmodule from testpackage.subpackage - testpackage/latesymbolimport.py:3: symbol import follows non-symbol import: mercurial.node - testpackage/multiple.py:2: multiple imported names: os, sys - testpackage/multiplegroups.py:3: multiple "from . import" statements - testpackage/relativestdlib.py:2: relative import of stdlib module - testpackage/requirerelative.py:2: import should be relative: testpackage.unsorted - testpackage/sortedentries.py:2: imports from testpackage not lexically sorted: bar < foo - testpackage/stdafterlocal.py:3: stdlib import "os" follows local import: testpackage - testpackage/stdlibfrom.py:2: direct symbol import abc from collections - testpackage/subpackage/levelpriority.py:3: higher-level import should come first: testpackage - testpackage/subpackage/localimport.py:7: multiple "from .. import" statements - testpackage/subpackage/localimport.py:8: import should be relative: testpackage.subpackage.levelpriority - testpackage/symbolimport.py:2: direct symbol import foo from testpackage.unsorted - testpackage/unsorted.py:3: imports not lexically sorted: os < sys - testpackage2/latesymbolimport.py:3: symbol import follows non-symbol import: mercurial.node + testpackage/importalias.py:1: ui module must be "as" aliased to uimod + testpackage/importfromalias.py:1: ui from testpackage must be "as" aliased to uimod + testpackage/importfromrelative.py:1: import should be relative: testpackage.unsorted + testpackage/importfromrelative.py:1: direct symbol import foo from testpackage.unsorted + testpackage/importsymbolfromsub.py:1: direct symbol import nonmodule from testpackage.subpackage + testpackage/latesymbolimport.py:2: symbol import follows non-symbol import: mercurial.node + testpackage/multiple.py:1: multiple imported names: os, sys + testpackage/multiplegroups.py:2: multiple "from . import" statements + testpackage/relativestdlib.py:1: relative import of stdlib module + testpackage/requirerelative.py:1: import should be relative: testpackage.unsorted + testpackage/sortedentries.py:1: imports from testpackage not lexically sorted: bar < foo + testpackage/stdafterlocal.py:2: stdlib import "os" follows local import: testpackage + testpackage/stdlibfrom.py:1: direct symbol import abc from collections + testpackage/subpackage/levelpriority.py:2: higher-level import should come first: testpackage + testpackage/subpackage/localimport.py:6: multiple "from .. import" statements + testpackage/subpackage/localimport.py:7: import should be relative: testpackage.subpackage.levelpriority + testpackage/symbolimport.py:1: direct symbol import foo from testpackage.unsorted + testpackage/unsorted.py:2: imports not lexically sorted: os < sys + testpackage2/latesymbolimport.py:2: symbol import follows non-symbol import: mercurial.node [1] diff --git a/tests/test-inherit-mode.t b/tests/test-inherit-mode.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1pbmhlcml0LW1vZGUudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1pbmhlcml0LW1vZGUudA== 100644 --- a/tests/test-inherit-mode.t +++ b/tests/test-inherit-mode.t @@ -10,7 +10,6 @@ $ cd dir $ cat >printmodes.py <<EOF - > from __future__ import absolute_import, print_function > import os > import sys > @@ -31,7 +30,6 @@ > EOF $ cat >mode.py <<EOF - > from __future__ import absolute_import, print_function > import os > import sys > print('%05o' % os.lstat(sys.argv[1]).st_mode) diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLWNhY2hlLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLWNhY2hlLnQ= 100644 --- a/tests/test-largefiles-cache.t +++ b/tests/test-largefiles-cache.t @@ -96,7 +96,6 @@ $ cat > ls-l.py <<EOF > #!$PYTHON - > from __future__ import absolute_import, print_function > import os > import sys > path = sys.argv[1] diff --git a/tests/test-largefiles-small-disk.t b/tests/test-largefiles-small-disk.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLXNtYWxsLWRpc2sudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLXNtYWxsLWRpc2sudA== 100644 --- a/tests/test-largefiles-small-disk.t +++ b/tests/test-largefiles-small-disk.t @@ -1,7 +1,6 @@ Test how largefiles abort in case the disk runs full $ cat > criple.py <<EOF - > from __future__ import absolute_import > import errno > import os > import shutil diff --git a/tests/test-log-exthook.t b/tests/test-log-exthook.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1sb2ctZXh0aG9vay50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1sb2ctZXh0aG9vay50 100644 --- a/tests/test-log-exthook.t +++ b/tests/test-log-exthook.t @@ -2,7 +2,6 @@ ------------------------------------------- $ cat > $TESTTMP/logexthook.py <<EOF - > from __future__ import absolute_import > import codecs > from mercurial import ( > commands, diff --git a/tests/test-log.t b/tests/test-log.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1sb2cudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1sb2cudA== 100644 --- a/tests/test-log.t +++ b/tests/test-log.t @@ -2451,7 +2451,6 @@ $ cat > ../names.py <<EOF > """A small extension to test adding arbitrary names to a repo""" - > from __future__ import absolute_import > from mercurial import namespaces > > def reposetup(ui, repo): diff --git a/tests/test-logtoprocess.t b/tests/test-logtoprocess.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1sb2d0b3Byb2Nlc3MudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1sb2d0b3Byb2Nlc3MudA== 100644 --- a/tests/test-logtoprocess.t +++ b/tests/test-logtoprocess.t @@ -8,7 +8,6 @@ $ hg init $ cat > $TESTTMP/foocommand.py << EOF - > from __future__ import absolute_import > from mercurial import registrar > cmdtable = {} > command = registrar.command(cmdtable) diff --git a/tests/test-merge-symlinks.t b/tests/test-merge-symlinks.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1tZXJnZS1zeW1saW5rcy50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1tZXJnZS1zeW1saW5rcy50 100644 --- a/tests/test-merge-symlinks.t +++ b/tests/test-merge-symlinks.t @@ -1,6 +1,5 @@ $ cat > echo.py <<EOF > #!$PYTHON - > from __future__ import absolute_import, print_function > import os > import sys > try: diff --git a/tests/test-merge1.t b/tests/test-merge1.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1tZXJnZTEudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1tZXJnZTEudA== 100644 --- a/tests/test-merge1.t +++ b/tests/test-merge1.t @@ -1,5 +1,4 @@ $ cat <<EOF > merge - > from __future__ import print_function > import sys, os > > try: @@ -354,7 +353,6 @@ trigger it. If you see flakyness here, there is a race. $ cat > $TESTTMP/abort.py <<EOF - > from __future__ import absolute_import > # emulate aborting before "recordupdates()". in this case, files > # are changed without updating dirstate > from mercurial import ( diff --git a/tests/test-narrow-clone-non-narrow-server.t b/tests/test-narrow-clone-non-narrow-server.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1uYXJyb3ctY2xvbmUtbm9uLW5hcnJvdy1zZXJ2ZXIudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1uYXJyb3ctY2xvbmUtbm9uLW5hcnJvdy1zZXJ2ZXIudA== 100644 --- a/tests/test-narrow-clone-non-narrow-server.t +++ b/tests/test-narrow-clone-non-narrow-server.t @@ -20,7 +20,6 @@ Verify that narrow is advertised in the bundle2 capabilities: $ cat >> unquote.py <<EOF - > from __future__ import print_function > import sys > if sys.version[0] == '3': > import urllib.parse as up diff --git a/tests/test-notify.t b/tests/test-notify.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1ub3RpZnkudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1ub3RpZnkudA== 100644 --- a/tests/test-notify.t +++ b/tests/test-notify.t @@ -1,5 +1,4 @@ $ cat > $TESTTMP/filter.py <<EOF - > from __future__ import absolute_import, print_function > import io > import re > import sys diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1vYnNvbGV0ZS50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1vYnNvbGV0ZS50 100644 --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -1465,7 +1465,6 @@ Test heads computation on pending index changes with obsolescence markers $ cd .. $ cat >$TESTTMP/test_extension.py << EOF - > from __future__ import absolute_import > from mercurial.i18n import _ > from mercurial import cmdutil, pycompat, registrar > from mercurial.utils import stringutil @@ -1499,7 +1498,6 @@ bookmarks change $ cd .. $ cat >$TESTTMP/test_extension.py << EOF - > from __future__ import absolute_import, print_function > import weakref > from mercurial import ( > bookmarks, diff --git a/tests/test-pager.t b/tests/test-pager.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1wYWdlci50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1wYWdlci50 100644 --- a/tests/test-pager.t +++ b/tests/test-pager.t @@ -411,7 +411,6 @@ Environment variables like LESS and LV are set automatically: $ cat > $TESTTMP/printlesslv.py <<EOF - > from __future__ import absolute_import > import os > import sys > sys.stdin.read() diff --git a/tests/test-parseindex.t b/tests/test-parseindex.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1wYXJzZWluZGV4LnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1wYXJzZWluZGV4LnQ= 100644 --- a/tests/test-parseindex.t +++ b/tests/test-parseindex.t @@ -26,7 +26,6 @@ summary: change foo $ cat >> test.py << EOF - > from __future__ import print_function > from mercurial import changelog, node, pycompat, vfs > > class singlebyteread(object): @@ -75,7 +74,6 @@ $ cd a $ "$PYTHON" <<EOF - > from __future__ import print_function > from mercurial import changelog, vfs > cl = changelog.changelog(vfs.vfs(b'.hg/store')) > print('good heads:') @@ -177,7 +175,6 @@ 1 2 1 -1 base 66 65 66 1.01538 66 0 0.00000 $ cat <<EOF > test.py - > from __future__ import print_function > import sys > from mercurial import changelog, pycompat, vfs > cl = changelog.changelog(vfs.vfs(pycompat.fsencode(sys.argv[1]))) diff --git a/tests/test-patch.t b/tests/test-patch.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1wYXRjaC50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1wYXRjaC50 100644 --- a/tests/test-patch.t +++ b/tests/test-patch.t @@ -1,5 +1,4 @@ $ cat > patchtool.py <<EOF - > from __future__ import absolute_import, print_function > import sys > print('Using custom patch') > if '--binary' in sys.argv: diff --git a/tests/test-patchbomb.t b/tests/test-patchbomb.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1wYXRjaGJvbWIudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1wYXRjaGJvbWIudA== 100644 --- a/tests/test-patchbomb.t +++ b/tests/test-patchbomb.t @@ -8,7 +8,6 @@ --===+[0-9]+=+$ -> --===*= (glob) $ cat > prune-blank-after-boundary.py <<EOF - > from __future__ import absolute_import, print_function > import sys > skipblank = False > trim = lambda x: x.strip(' \r\n') diff --git a/tests/test-profile.t b/tests/test-profile.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1wcm9maWxlLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1wcm9maWxlLnQ= 100644 --- a/tests/test-profile.t +++ b/tests/test-profile.t @@ -132,7 +132,6 @@ profiler extension could be loaded before other extensions $ cat > fooprof.py <<EOF - > from __future__ import absolute_import > import contextlib > import sys > @contextlib.contextmanager @@ -147,7 +146,6 @@ > EOF $ cat > otherextension.py <<EOF - > from __future__ import absolute_import > def extsetup(ui): > ui.write(b'otherextension: loaded\n') > EOF diff --git a/tests/test-progress.t b/tests/test-progress.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1wcm9ncmVzcy50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1wcm9ncmVzcy50 100644 --- a/tests/test-progress.t +++ b/tests/test-progress.t @@ -1,6 +1,5 @@ $ cat > loop.py <<EOF - > from __future__ import absolute_import > import time > from mercurial import commands, registrar > diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1yZWJhc2UtZGVzdC50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1yZWJhc2UtZGVzdC50 100644 --- a/tests/test-rebase-dest.t +++ b/tests/test-rebase-dest.t @@ -81,7 +81,6 @@ $ cd $TESTTMP $ cat >> $TESTTMP/maprevset.py <<EOF - > from __future__ import absolute_import > from mercurial import registrar, revset, revsetlang, smartset > revsetpredicate = registrar.revsetpredicate() > cache = {} diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1yZWJhc2Utc2NlbmFyaW8tZ2xvYmFsLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1yZWJhc2Utc2NlbmFyaW8tZ2xvYmFsLnQ= 100644 --- a/tests/test-rebase-scenario-global.t +++ b/tests/test-rebase-scenario-global.t @@ -949,7 +949,6 @@ $ hg init tr-state $ cd tr-state $ cat > $TESTTMP/wraprebase.py <<EOF - > from __future__ import absolute_import > from mercurial import extensions > def _rebase(orig, ui, repo, *args, **kwargs): > with repo.wlock(): diff --git a/tests/test-relink.t b/tests/test-relink.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1yZWxpbmsudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1yZWxpbmsudA== 100644 --- a/tests/test-relink.t +++ b/tests/test-relink.t @@ -8,7 +8,6 @@ > } $ cat > arelinked.py <<EOF - > from __future__ import absolute_import, print_function > import os > import sys > from mercurial import ( diff --git a/tests/test-requires.t b/tests/test-requires.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1yZXF1aXJlcy50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1yZXF1aXJlcy50 100644 --- a/tests/test-requires.t +++ b/tests/test-requires.t @@ -32,7 +32,6 @@ $ echo 'featuresetup-test' >> supported/.hg/requires $ cat > $TESTTMP/supported-locally/supportlocally.py <<EOF - > from __future__ import absolute_import > from mercurial import extensions, localrepo > def featuresetup(ui, supported): > for name, module in extensions.extensions(ui): diff --git a/tests/test-revert.t b/tests/test-revert.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1yZXZlcnQudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1yZXZlcnQudA== 100644 --- a/tests/test-revert.t +++ b/tests/test-revert.t @@ -550,7 +550,6 @@ $ cat << EOF >> dircontent.py > # generate a simple text view of the directory for easy comparison - > from __future__ import print_function > import os > files = os.listdir('.') > files.sort() diff --git a/tests/test-revlog-mmapindex.t b/tests/test-revlog-mmapindex.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1yZXZsb2ctbW1hcGluZGV4LnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1yZXZsb2ctbW1hcGluZGV4LnQ= 100644 --- a/tests/test-revlog-mmapindex.t +++ b/tests/test-revlog-mmapindex.t @@ -2,7 +2,6 @@ $ cat << EOF > verbosemmap.py > # extension to make util.mmapread verbose > - > from __future__ import absolute_import > > from mercurial import ( > extensions, diff --git a/tests/test-revset.t b/tests/test-revset.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1yZXZzZXQudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1yZXZzZXQudA== 100644 --- a/tests/test-revset.t +++ b/tests/test-revset.t @@ -36,7 +36,6 @@ these predicates use '\0' as a separator: $ cat <<EOF > debugrevlistspec.py - > from __future__ import absolute_import > from mercurial import ( > node as nodemod, > registrar, diff --git a/tests/test-share-bookmarks.t b/tests/test-share-bookmarks.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1zaGFyZS1ib29rbWFya3MudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1zaGFyZS1ib29rbWFya3MudA== 100644 --- a/tests/test-share-bookmarks.t +++ b/tests/test-share-bookmarks.t @@ -222,7 +222,6 @@ $ cat > failpullbookmarks.py << EOF > """A small extension that makes bookmark pulls fail, for testing""" - > from __future__ import absolute_import > from mercurial import ( > error, > exchange, diff --git a/tests/test-ssh-proto-unbundle.t b/tests/test-ssh-proto-unbundle.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1zc2gtcHJvdG8tdW5idW5kbGUudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1zc2gtcHJvdG8tdW5idW5kbGUudA== 100644 --- a/tests/test-ssh-proto-unbundle.t +++ b/tests/test-ssh-proto-unbundle.t @@ -99,7 +99,6 @@ Test pushing to a server that has a pretxnchangegroup Python hook that fails $ cat > $TESTTMP/failhook << EOF - > from __future__ import print_function > import sys > def hook1line(ui, repo, **kwargs): > ui.write(b'ui.write 1 line\n') diff --git a/tests/test-strip.t b/tests/test-strip.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC1zdHJpcC50..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC1zdHJpcC50 100644 --- a/tests/test-strip.t +++ b/tests/test-strip.t @@ -1290,7 +1290,6 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo 3 >> I $ cat > $TESTTMP/delayedstrip.py <<EOF - > from __future__ import absolute_import > from mercurial import commands, registrar, repair > cmdtable = {} > command = registrar.command(cmdtable) diff --git a/tests/test-template-functions.t b/tests/test-template-functions.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC10ZW1wbGF0ZS1mdW5jdGlvbnMudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC10ZW1wbGF0ZS1mdW5jdGlvbnMudA== 100644 --- a/tests/test-template-functions.t +++ b/tests/test-template-functions.t @@ -1572,7 +1572,6 @@ Test cbor filter: $ cat <<'EOF' > "$TESTTMP/decodecbor.py" - > from __future__ import absolute_import > from mercurial import ( > dispatch, > ) diff --git a/tests/test-template-map.t b/tests/test-template-map.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC10ZW1wbGF0ZS1tYXAudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC10ZW1wbGF0ZS1tYXAudA== 100644 --- a/tests/test-template-map.t +++ b/tests/test-template-map.t @@ -722,7 +722,6 @@ test CBOR style: $ cat <<'EOF' > "$TESTTMP/decodecborarray.py" - > from __future__ import absolute_import > from mercurial import ( > dispatch, > ) diff --git a/tests/test-update-atomic.t b/tests/test-update-atomic.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC11cGRhdGUtYXRvbWljLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC11cGRhdGUtYXRvbWljLnQ= 100644 --- a/tests/test-update-atomic.t +++ b/tests/test-update-atomic.t @@ -3,7 +3,6 @@ Checking that experimental.atomic-file works. $ cat > $TESTTMP/show_mode.py <<EOF - > from __future__ import print_function > import os > import stat > import sys @@ -20,7 +19,6 @@ $ cd repo $ cat > .hg/showwrites.py <<EOF - > from __future__ import print_function > from mercurial import pycompat > from mercurial.utils import stringutil > def uisetup(ui): diff --git a/tests/test-verify.t b/tests/test-verify.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC12ZXJpZnkudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC12ZXJpZnkudA== 100644 --- a/tests/test-verify.t +++ b/tests/test-verify.t @@ -338,7 +338,6 @@ checked 1 changesets with 1 changes to 1 files $ cat >> $TESTTMP/break-base64.py <<EOF - > from __future__ import absolute_import > import base64 > base64.b64decode=lambda x: x > EOF diff --git a/tests/test-walk.t b/tests/test-walk.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC13YWxrLnQ=..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC13YWxrLnQ= 100644 --- a/tests/test-walk.t +++ b/tests/test-walk.t @@ -640,7 +640,6 @@ $ cd t $ echo fennel > overflow.list $ cat >> printnum.py <<EOF - > from __future__ import print_function > for i in range(20000 // 100): > print('x' * 100) > EOF diff --git a/tests/test-worker.t b/tests/test-worker.t index 6000f5b25c9b134c05c87c72210b5f5f8460f014_dGVzdHMvdGVzdC13b3JrZXIudA==..42d2b31cee0b1357f1740ccd16a00896769b9748_dGVzdHMvdGVzdC13b3JrZXIudA== 100644 --- a/tests/test-worker.t +++ b/tests/test-worker.t @@ -1,7 +1,6 @@ Test UI worker interaction $ cat > t.py <<EOF - > from __future__ import absolute_import, print_function > import sys > import time > from mercurial import ( @@ -100,7 +99,6 @@ Workers should not do cleanups in all cases $ cat > $TESTTMP/detectcleanup.py <<EOF - > from __future__ import absolute_import > import atexit > import os > import sys @@ -134,7 +132,6 @@ Do not crash on partially read result $ cat > $TESTTMP/detecttruncated.py <<EOF - > from __future__ import absolute_import > import os > import sys > import time