test-demandimport: ensure that relative imports are deferred

This adds a test not just at our local "top level" (the mercurial
package), but also one level deeper (mercurial.hgweb).

tests/test-demandimport.py

@@ -1,55 +1,60
 from mercurial import demandimport
 demandimport.enable()
 
 import os
 if os.name != 'nt':
     try:
         import distutils.msvc9compiler
         print ('distutils.msvc9compiler needs to be an immediate '
                'importerror on non-windows platforms')
         distutils.msvc9compiler
     except ImportError:
         pass
 
 import re
 
 rsub = re.sub
 def f(obj):
     l = repr(obj)
     l = rsub("0x[0-9a-fA-F]+", "0x?", l)
     l = rsub("from '.*'", "from '?'", l)
     l = rsub("'<[a-z]*>'", "'<whatever>'", l)
     return l
 
 import os
 
 print "os =", f(os)
 print "os.system =", f(os.system)
 print "os =", f(os)
 
 from mercurial import util
 
 print "util =", f(util)
 print "util.system =", f(util.system)
 print "util =", f(util)
 print "util.system =", f(util.system)
 
+from mercurial import hgweb
+print "hgweb =", f(hgweb)
+print "hgweb_mod =", f(hgweb.hgweb_mod)
+print "hgweb =", f(hgweb)
+
 import re as fred
 print "fred =", f(fred)
 
 import sys as re
 print "re =", f(re)
 
 print "fred =", f(fred)
 print "fred.sub =", f(fred.sub)
 print "fred =", f(fred)
 
 print "re =", f(re)
 print "re.stderr =", f(re.stderr)
 print "re =", f(re)
 
 demandimport.disable()
 os.environ['HGDEMANDIMPORT'] = 'disable'
 demandimport.enable()
 from mercurial import node
 print "node =", f(node)

tests/test-demandimport.py.out

@@ -1,16 +1,19
 os = <unloaded module 'os'>
 os.system = <built-in function system>
 os = <module 'os' from '?'>
 util = <unloaded module 'util'>
 util.system = <function system at 0x?>
 util = <module 'mercurial.util' from '?'>
 util.system = <function system at 0x?>
+hgweb = <unloaded module 'hgweb'>
+hgweb_mod = <unloaded module 'hgweb_mod'>
+hgweb = <module 'mercurial.hgweb' from '?'>
 fred = <unloaded module 're'>
 re = <unloaded module 'sys'>
 fred = <unloaded module 're'>
 fred.sub = <function sub at 0x?>
 fred = <proxied module 're'>
 re = <unloaded module 'sys'>
 re.stderr = <open file '<whatever>', mode 'w' at 0x?>
 re = <proxied module 'sys'>
 node = <module 'mercurial.node' from '?'>