py3: make .py tests continue to run on python 2

Summary:
Use sed to convert testutil.ddot requires to hghave.

ignore-conflict-markers

for test-simplemerge.py

Reviewed By: simpkins

Differential Revision: D19658355

fbshipit-source-id: afae73eb1e43ead79514dfaf9f911f51ac25972e

eden/scm/tests/test-ancestor.py

@@ -10,10 +10,10 @@ import time
 
 from edenscm.mercurial import ancestor, debugcommands, hg, pycompat, ui as uimod, util
 from edenscm.mercurial.node import nullrev
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 if sys.version_info[0] >= 3:
     long = int

eden/scm/tests/test-annotate.py

@@ -4,10 +4,10 @@ import unittest
 
 from edenscm.mercurial import mdiff
 from edenscm.mercurial.context import _annotatepair, annotateline
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 try:
     xrange(0)

eden/scm/tests/test-argspans.py

@@ -9,11 +9,11 @@ from __future__ import absolute_import
 import os
 import sys
 
+from hghave import require
 from testutil import argspans
-from testutil.dott import feature
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 try:

eden/scm/tests/test-atomictempfile.py

@@ -7,10 +7,10 @@ import tempfile
 import unittest
 
 from edenscm.mercurial import util
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 atomictempfile = util.atomictempfile

eden/scm/tests/test-batching.py

@@ -8,10 +8,10 @@
 from __future__ import absolute_import, print_function
 
 from edenscm.mercurial import error, peer, util, wireproto
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 # equivalent of repo.repository

eden/scm/tests/test-bdiff.py

@@ -5,10 +5,10 @@ import struct
 import unittest
 
 from edenscm.mercurial import mdiff
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 class diffreplace(collections.namedtuple("diffreplace", "start end from_ to")):

eden/scm/tests/test-bookmarkstore.py

@@ -9,10 +9,10 @@ import unittest
 import silenttestrunner
 from bindings import bookmarkstore
 from edenscm.mercurial import node
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 class bookmarkstoretests(unittest.TestCase):

eden/scm/tests/test-check-interfaces.py

@@ -3,10 +3,10 @@
 from __future__ import absolute_import, print_function
 
 from edenscm.mercurial import bundlerepo, httppeer, localrepo, sshpeer, ui as uimod
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def checkobject(o):

eden/scm/tests/test-check-win32-signature.py

@@ -6,10 +6,10 @@
 import os
 import re
 
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def checkpath(path, dllnames):

eden/scm/tests/test-context.py

@@ -4,10 +4,10 @@ import os
 
 from edenscm.mercurial import context, encoding, hg, scmutil, ui as uimod
 from edenscm.mercurial.node import hex
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 u = uimod.ui.load()

eden/scm/tests/test-demandimport.py

@@ -9,9 +9,9 @@ demandimport.enable()
 import os
 import subprocess
 import sys
-from testutil.dott import feature
+from hghave import require
 
-feature.require(["py2"])
+require(["py2"])
 
 # Only run if demandimport is allowed
 if subprocess.call(["python", "%s/hghave" % os.environ["TESTDIR"], "demandimport"]):

eden/scm/tests/test-dispatch.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import, print_function
 import os
 
 from edenscm.mercurial import dispatch
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def testdispatch(cmd):

eden/scm/tests/test-doctest.py

@@ -7,10 +7,10 @@ import os
 import re
 import sys
 
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 ispy3 = sys.version_info[0] >= 3

eden/scm/tests/test-duplicateoptions.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import, print_function
 import os
 
 from edenscm.mercurial import commands, extensions, ui as uimod
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 ignore = {

eden/scm/tests/test-encoding-func.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import
 import unittest
 
 from edenscm.mercurial import encoding
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 class IsasciistrTest(unittest.TestCase):

eden/scm/tests/test-extensions-wrapfunction.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import, print_function
 
 from edenscm.mercurial import extensions
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def genwrapper(x):

eden/scm/tests/test-fb-convert-repo.py

@@ -2,10 +2,10 @@ import os
 import unittest
 
 from edenscm.hgext.convert.repo import gitutil, repo
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def draft(test_func):

eden/scm/tests/test-fb-hgext-absorb-filefixupstate.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import
 import itertools
 
 from edenscm.hgext import absorb
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 class simplefctx(object):

eden/scm/tests/test-fb-hgext-extutil.py

@@ -10,10 +10,10 @@ import unittest
 import silenttestrunner
 from edenscm.hgext import extutil
 from edenscm.mercurial import error, vfs, worker
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 locktimeout = 25

eden/scm/tests/test-fb-hgext-fastannotate-revmap.py

@@ -4,10 +4,10 @@ import os
 import tempfile
 
 from edenscm.hgext.fastannotate import error, revmap
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 try:

eden/scm/tests/test-fb-hgext-generic-bisect.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import
 import unittest
 
 import silenttestrunner
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 class BisectTests(unittest.TestCase):

eden/scm/tests/test-fb-hgext-patchrmdir.py

@@ -5,10 +5,10 @@ import sys
 
 from edenscm.hgext import patchrmdir
 from edenscm.mercurial import util
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 if not sys.platform.startswith("linux"):

eden/scm/tests/test-fb-hgext-remotefilelog-datapack.py

@@ -18,10 +18,10 @@ from edenscm.hgext.remotefilelog import constants
 from edenscm.hgext.remotefilelog.datapack import datapackstore
 from edenscm.mercurial import error
 from edenscm.mercurial.node import nullid
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 SMALLFANOUTCUTOFF = 2 ** 16 / 8

eden/scm/tests/test-fb-hgext-remotefilelog-histpack.py

@@ -15,10 +15,10 @@ from bindings import revisionstore
 from edenscm.hgext.remotefilelog.metadatastore import unionmetadatastore
 from edenscm.mercurial import error, ui as uimod, util
 from edenscm.mercurial.node import nullid
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 SMALLFANOUTCUTOFF = 2 ** 16 / 8

eden/scm/tests/test-fb-hgext-sshaskpass.py

@@ -7,10 +7,10 @@ import sys
 # Make sure we use sshaskpass.py in this repo, unaffected by PYTHONPATH
 from edenscm.hgext import sshaskpass
 from edenscm.mercurial import error
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 if not sys.platform.startswith("linux"):

eden/scm/tests/test-filecache.py

@@ -12,10 +12,10 @@ from edenscm.mercurial import (
     util,
     vfs as vfsmod,
 )
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 try:

eden/scm/tests/test-filelog.py

@@ -6,10 +6,10 @@ from __future__ import absolute_import, print_function
 
 from edenscm.mercurial import hg, ui as uimod
 from edenscm.mercurial.node import hex, nullid
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 myui = uimod.ui.load()

eden/scm/tests/test-hg-parseurl.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import, print_function
 
 from edenscm.mercurial import hg
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def testparse(url, branch=[]):

eden/scm/tests/test-hggit-url-parsing.py

@@ -5,10 +5,10 @@ import sys
 import tempfile
 
 from edenscm.mercurial import commands, hg, ui
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 try:

eden/scm/tests/test-hybridencode.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import, print_function
 
 from edenscm.mercurial import store
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def show(s):

eden/scm/tests/test-lfs-pointer.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import, print_function
 
 from edenscm.hgext.lfs import pointer
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def tryparse(text):

eden/scm/tests/test-linerange.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import
 import unittest
 
 from edenscm.mercurial import error, mdiff
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 # for readability, line numbers are 0-origin

eden/scm/tests/test-linkrevcache-linkrevdb.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import, print_function
 import tempfile
 
 from edenscm.hgext import linkrevcache
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 try:

eden/scm/tests/test-lock.py

@@ -17,10 +17,10 @@ from edenscm.mercurial import (
     util,
     vfs as vfsmod,
 )
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 testlockname = "testlock"

eden/scm/tests/test-lrucachedict.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import, print_function
 
 from edenscm.mercurial import util
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def printifpresent(d, xs, name="d"):

eden/scm/tests/test-manifest.py

@@ -6,10 +6,10 @@ import unittest
 
 import silenttestrunner
 from edenscm.mercurial import manifest as manifestmod, match as matchmod
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 EMTPY_MANIFEST = b""

eden/scm/tests/test-match.py

@@ -4,10 +4,10 @@ import unittest
 
 import silenttestrunner
 from edenscm.mercurial import match as matchmod
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 class NeverMatcherTests(unittest.TestCase):

eden/scm/tests/test-minirst.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import, print_function
 import pprint
 
 from edenscm.mercurial import minirst
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def debugformat(text, form, **kwargs):

eden/scm/tests/test-pathencode.py

@@ -17,10 +17,10 @@ import sys
 import time
 
 from edenscm.mercurial import pycompat, store
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 try:

eden/scm/tests/test-propertycache.py

@@ -10,10 +10,10 @@ import os
 import subprocess
 
 from edenscm.mercurial import hg, localrepo, ui as uimod, util
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 # create some special property cache that trace they call

eden/scm/tests/test-revlog-ancestry.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import, print_function
 import os
 
 from edenscm.mercurial import hg, merge, ui as uimod
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 u = uimod.ui.load()

eden/scm/tests/test-revlog-raw.py

@@ -5,10 +5,10 @@ from __future__ import absolute_import, print_function
 import sys
 
 from edenscm.mercurial import encoding, node, revlog, transaction, vfs
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 # TESTTMP is optional. This makes it convenient to run without run-tests.py

eden/scm/tests/test-run-tests.py

@@ -9,10 +9,10 @@ import doctest
 import os
 import re
 
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 # this is hack to make sure no escape characters are inserted into the output

eden/scm/tests/test-rustthreading.py

@@ -49,11 +49,6 @@
 
 from __future__ import absolute_import
 
-
-from testutil.dott import feature
-
-feature.require(["py2"])
-
 import os
 import thread
 import threading
@@ -63,6 +58,10 @@ from thread import get_ident, start_new_thread
 
 import silenttestrunner
 from bindings import threading as rustthreading
+from hghave import require
+
+
+require(["py2"])
 
 
 # From test_support.py

eden/scm/tests/test-simplekeyvaluefile.py

@@ -5,10 +5,10 @@ import unittest
 import silenttestrunner
 from edenscm.mercurial import error, scmutil
 from edenscm.mercurial.pycompat import encodeutf8
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 class mockfile(object):

eden/scm/tests/test-simplemerge.py

@@ -18,10 +18,10 @@ from __future__ import absolute_import
 import unittest
 
 from edenscm.mercurial import error, simplemerge, util
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 TestCase = unittest.TestCase

eden/scm/tests/test-sshserver.py

@@ -5,10 +5,10 @@ import unittest
 
 import silenttestrunner
 from edenscm.mercurial import sshserver, wireproto
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 class SSHServerGetArgsTests(unittest.TestCase):

eden/scm/tests/test-stackdesc.py

@@ -6,9 +6,9 @@
 
 import os
 import sys
-from testutil.dott import feature
+from hghave import require
 
-feature.require(["py2"])
+require(["py2"])
 
 if os.name == "nt":
     sys.exit(80)

eden/scm/tests/test-symlink-os-yes-fs-no.py

@@ -5,10 +5,10 @@ import sys
 import time
 
 from edenscm.mercurial import commands, fscap, hg, ui as uimod, util
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 TESTDIR = os.environ["TESTDIR"]

eden/scm/tests/test-treestate.py

@@ -9,10 +9,10 @@ import unittest
 
 import silenttestrunner
 from bindings import treestate
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 testtmp = os.getenv("TESTTMP") or tempfile.mkdtemp("test-treestate")

eden/scm/tests/test-ui-color.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import, print_function
 import os
 
 from edenscm.mercurial import dispatch, ui as uimod
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 # ensure errors aren't buffered

eden/scm/tests/test-ui-config.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import, print_function
 
 from edenscm.mercurial import dispatch, error, ui as uimod
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 testui = uimod.ui.load()

eden/scm/tests/test-ui-verbosity.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import, print_function
 import os
 
 from edenscm.mercurial import ui as uimod
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 hgrc = os.environ["HGRCPATH"]

eden/scm/tests/test-url.py

@@ -5,10 +5,10 @@ import doctest
 import os
 
 from edenscm.mercurial import sslutil
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 def check(a, b):

eden/scm/tests/test-verify-repo-operations.py

@@ -11,9 +11,9 @@ unexpected errors and to compare different versions of it."""
 import os
 import subprocess
 import sys
-from testutil.dott import feature
+from hghave import require
 
-feature.require(["py2"])
+require(["py2"])
 
 # Only run if slow tests are allowed
 if subprocess.call(["python", "%s/hghave" % os.environ["TESTDIR"], "slow"]):

eden/scm/tests/test-walkrepo.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import, print_function
 import os
 
 from edenscm.mercurial import hg, scmutil, ui as uimod, util
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 chdir = os.chdir

eden/scm/tests/test-wireproto.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import, print_function
 
 from edenscm.mercurial import ui, util, wireproto
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 stringio = util.stringio

eden/scm/tests/test-zstdelta.py

@@ -5,10 +5,10 @@ import unittest
 
 import silenttestrunner
 from bindings import zstd
-from testutil.dott import feature
+from hghave import require
 
 
-feature.require(["py2"])
+require(["py2"])
 
 
 class testzstd(unittest.TestCase):