diff tests/test-clone.t @ 40369:ef6cab7930b3

py3: fix module imports in tests, as flagged by test-check-module-imports.t

I have no idea why these aren't flagged with python2.  I excluded
test-highlight.t for now to make this easier to review- the changed code is
committed to a repo, which has cascading changes on the rest of the test.

There's a mix of bytes and str in the imports dict of contrib/import-checker.py
that crashed it half way through listing out these errors.  I couldn't figure
out how to fix that properly, so I was lazy and applied this on py3, to find the
rest of the errors:

    diff --git a/contrib/import-checker.py b/contrib/import-checker.py
    --- a/contrib/import-checker.py
    +++ b/contrib/import-checker.py
    @@ -626,7 +626,12 @@ def find_cycles(imports):
         top.foo -> top.qux -> top.foo
         """
         cycles = set()
    -    for mod in sorted(imports.keys()):
    +    def sort(v):
    +        if isinstance(v, bytes):
    +            return v.decode('ascii')
    +        return v
    +
    +    for mod in sorted(imports.keys(), key=sort):
             try:
                 checkmod(mod, imports)
             except CircularImport as e:

--- a/tests/test-clone.t	Thu Oct 18 21:55:47 2018 -0400
+++ b/tests/test-clone.t	Wed Oct 17 23:33:43 2018 -0400
@@ -558,8 +558,8 @@
 iterable in addbranchrevs()
 
   $ cat <<EOF > simpleclone.py
-  > from mercurial import ui, hg
-  > myui = ui.ui.load()
+  > from mercurial import hg, ui as uimod
+  > myui = uimod.ui.load()
   > repo = hg.repository(myui, b'a')
   > hg.clone(myui, {}, repo, dest=b"ua")
   > EOF
@@ -571,8 +571,8 @@
   $ rm -r ua
 
   $ cat <<EOF > branchclone.py
-  > from mercurial import ui, hg, extensions
-  > myui = ui.ui.load()
+  > from mercurial import extensions, hg, ui as uimod
+  > myui = uimod.ui.load()
   > extensions.loadall(myui)
   > repo = hg.repository(myui, b'a')
   > hg.clone(myui, {}, repo, dest=b"ua", branch=[b"stable",])