Mercurial > hg
comparison tests/test-bundle2-exchange.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:
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 17 Oct 2018 23:33:43 -0400 |
parents | 58ebf5083843 |
children | 34a46d48d24e |
comparison
equal
deleted
inserted
replaced
40368:fad6068249d9 | 40369:ef6cab7930b3 |
---|---|
932 > ssh="$PYTHON" "$TESTDIR/dummyssh" | 932 > ssh="$PYTHON" "$TESTDIR/dummyssh" |
933 > EOF | 933 > EOF |
934 | 934 |
935 $ cat >> $TESTTMP/locktester.py <<EOF | 935 $ cat >> $TESTTMP/locktester.py <<EOF |
936 > import os | 936 > import os |
937 > from mercurial import extensions, bundle2, error | 937 > from mercurial import bundle2, error, extensions |
938 > def checklock(orig, repo, *args, **kwargs): | 938 > def checklock(orig, repo, *args, **kwargs): |
939 > if repo.svfs.lexists(b"lock"): | 939 > if repo.svfs.lexists(b"lock"): |
940 > raise error.Abort(b"Lock should not be taken") | 940 > raise error.Abort(b"Lock should not be taken") |
941 > return orig(repo, *args, **kwargs) | 941 > return orig(repo, *args, **kwargs) |
942 > def extsetup(ui): | 942 > def extsetup(ui): |