Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: look for 'mod' suffix as alternative name for module reference
authorYuya Nishihara <yuya@tcha.org>
Fri, 28 Apr 2017 23:46:16 +0900
changeset 32447 252d2260c74e
parent 32446 63365e9621d6
child 32448 91a2ec8e7fa0
demandimport: look for 'mod' suffix as alternative name for module reference It's widely used in our codebase.
hgdemandimport/demandimportpy2.py file | annotate | diff | comparison | revisions
tests/test-demandimport.py file | annotate | diff | comparison | revisions
tests/test-demandimport.py.out file | annotate | diff | comparison | revisions 
--- a/hgdemandimport/demandimportpy2.py	Mon May 01 14:26:56 2017 +0900
+++ b/hgdemandimport/demandimportpy2.py	Fri Apr 28 23:46:16 2017 +0900
@@ -132,8 +132,11 @@
                 subload(mod, x)
 
             # Replace references to this proxy instance with the actual module.
-            if locals and locals.get(head) is self:
-                locals[head] = mod
+            if locals:
+                if locals.get(head) is self:
+                    locals[head] = mod
+                elif locals.get(head + r'mod') is self:
+                    locals[head + r'mod'] = mod
 
             for modname in modrefs:
                 modref = sys.modules.get(modname, None)
--- a/tests/test-demandimport.py	Mon May 01 14:26:56 2017 +0900
+++ b/tests/test-demandimport.py	Fri Apr 28 23:46:16 2017 +0900
@@ -52,6 +52,9 @@
 import re as fred
 print("fred =", f(fred))
 
+import re as remod
+print("remod =", f(remod))
+
 import sys as re
 print("re =", f(re))
 
@@ -59,6 +62,9 @@
 print("fred.sub =", f(fred.sub))
 print("fred =", f(fred))
 
+remod.escape  # use remod
+print("remod =", f(remod))
+
 print("re =", f(re))
 print("re.stderr =", f(re.stderr))
 print("re =", f(re))
--- a/tests/test-demandimport.py.out	Mon May 01 14:26:56 2017 +0900
+++ b/tests/test-demandimport.py.out	Fri Apr 28 23:46:16 2017 +0900
@@ -9,10 +9,12 @@
 hgweb_mod = <unloaded module 'hgweb_mod'>
 hgweb = <module 'mercurial.hgweb' from '?'>
 fred = <unloaded module 're'>
+remod = <unloaded module 're'>
 re = <unloaded module 'sys'>
 fred = <unloaded module 're'>
 fred.sub = <function sub at 0x?>
 fred = <proxied module 're'>
+remod = <module 're' from '?'>
 re = <unloaded module 'sys'>
 re.stderr = <open file '<whatever>', mode 'w' at 0x?>
 re = <proxied module 'sys'>
Mercurial