Mercurial > hg
comparison tests/test-purge.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 | c70bdd222dcd |
comparison
equal
deleted
inserted
replaced
40368:fad6068249d9 | 40369:ef6cab7930b3 |
---|---|
48 delete an untracked file | 48 delete an untracked file |
49 | 49 |
50 $ touch untracked_file | 50 $ touch untracked_file |
51 $ touch untracked_file_readonly | 51 $ touch untracked_file_readonly |
52 $ "$PYTHON" <<EOF | 52 $ "$PYTHON" <<EOF |
53 > import os, stat | 53 > import os |
54 > import stat | |
54 > f= 'untracked_file_readonly' | 55 > f= 'untracked_file_readonly' |
55 > os.chmod(f, stat.S_IMODE(os.stat(f).st_mode) & ~stat.S_IWRITE) | 56 > os.chmod(f, stat.S_IMODE(os.stat(f).st_mode) & ~stat.S_IWRITE) |
56 > EOF | 57 > EOF |
57 $ hg purge -p | 58 $ hg purge -p |
58 untracked_file | 59 untracked_file |