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:

     1

  $ hg init r1

     2

  $ cd r1

     3

  $ hg ci --config ui.allowemptycommit=true -m c0

     4

  $ hg ci --config ui.allowemptycommit=true -m c1

     5

  $ hg ci --config ui.allowemptycommit=true -m c2

     6

  $ hg co -q 0

     7

  $ hg ci --config ui.allowemptycommit=true -m c3

     8

  created new head

     9

  $ hg co -q 3

    10

  $ hg merge --quiet

    11

  $ hg ci --config ui.allowemptycommit=true -m c4

    12

    13

  $ hg log -G -T'{desc}'

    14

  @    c4

    15

  |\

    16

  | o  c3

    17

  | |

    18

  o |  c2

    19

  | |

    20

  o |  c1

    21

  |/

    22

  o  c0

    23

    24

    25

  >>> from mercurial import hg

    26

  >>> from mercurial import ui as uimod

    27

  >>> repo = hg.repository(uimod.ui())

    28

  >>> for anc in repo.changelog.ancestors([4], inclusive=True):

    29

  ...   print(anc)

    30

  4

    31

  3

    32

  2

    33

  1

    34

  0