##// END OF EJS Templates
tests: migrate demandimport.py away from deprecated `util` module symbols
Matt Harbison -
r37983:1d0610fd default
parent child Browse files
Show More
@@ -58,12 +58,12 b' print("os =", f(os))'
58 print("os.system =", f(os.system))
58 print("os.system =", f(os.system))
59 print("os =", f(os))
59 print("os =", f(os))
60
60
61 from mercurial import util
61 from mercurial.utils import procutil
62
62
63 print("util =", f(util))
63 print("procutil =", f(procutil))
64 print("util.system =", f(util.system))
64 print("procutil.system =", f(procutil.system))
65 print("util =", f(util))
65 print("procutil =", f(procutil))
66 print("util.system =", f(util.system))
66 print("procutil.system =", f(procutil.system))
67
67
68 from mercurial import hgweb
68 from mercurial import hgweb
69 print("hgweb =", f(hgweb))
69 print("hgweb =", f(hgweb))
@@ -100,6 +100,8 b' except ImportError as inst:'
100 print('contextlib.unknownattr = ImportError: %s'
100 print('contextlib.unknownattr = ImportError: %s'
101 % rsub(r"'", '', str(inst)))
101 % rsub(r"'", '', str(inst)))
102
102
103 from mercurial import util
104
103 # Unlike the import statement, __import__() function should not raise
105 # Unlike the import statement, __import__() function should not raise
104 # ImportError even if fromlist has an unknown item
106 # ImportError even if fromlist has an unknown item
105 # (see Python/import.c:import_module_level() and ensure_fromlist())
107 # (see Python/import.c:import_module_level() and ensure_fromlist())
@@ -7,10 +7,10 b" errorproxy = <proxied module 'error'>"
7 os = <unloaded module 'os'>
7 os = <unloaded module 'os'>
8 os.system = <built-in function system>
8 os.system = <built-in function system>
9 os = <module 'os' from '?'>
9 os = <module 'os' from '?'>
10 util = <unloaded module 'util'>
10 procutil = <unloaded module 'procutil'>
11 util.system = <function system at 0x?>
11 procutil.system = <function system at 0x?>
12 util = <module 'mercurial.util' from '?'>
12 procutil = <module 'mercurial.utils.procutil' from '?'>
13 util.system = <function system at 0x?>
13 procutil.system = <function system at 0x?>
14 hgweb = <unloaded module 'hgweb'>
14 hgweb = <unloaded module 'hgweb'>
15 hgweb_mod = <unloaded module 'hgweb_mod'>
15 hgweb_mod = <unloaded module 'hgweb_mod'>
16 hgweb = <module 'mercurial.hgweb' from '?'>
16 hgweb = <module 'mercurial.hgweb' from '?'>
General Comments 0
You need to be logged in to leave comments. Login now