Mercurial > hg
comparison tests/test-blackbox.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 | 5abc47d4ca6b |
children | 25f1c7bd649d |
comparison
equal
deleted
inserted
replaced
40368:fad6068249d9 | 40369:ef6cab7930b3 |
---|---|
349 $ chg noop | 349 $ chg noop |
350 $ chg noop | 350 $ chg noop |
351 $ chg noop | 351 $ chg noop |
352 | 352 |
353 $ cat > showsize.py << 'EOF' | 353 $ cat > showsize.py << 'EOF' |
354 > import os, sys | 354 > import os |
355 > import sys | |
355 > limit = 500 | 356 > limit = 500 |
356 > for p in sys.argv[1:]: | 357 > for p in sys.argv[1:]: |
357 > size = os.stat(p).st_size | 358 > size = os.stat(p).st_size |
358 > if size >= limit: | 359 > if size >= limit: |
359 > desc = '>=' | 360 > desc = '>=' |