# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1156257174 25200
# Node ID 94def4db6cd4ab883098f7e766eef70cae629b99
# Parent  985594e891b868ba159c00d73c2c0ace685cf6d2# Parent  4e815ee377fd1d6d2a00bbc95c561506db670c55
merge.

diff -r 4e815ee377fd -r 94def4db6cd4 mercurial/packagescan.py
--- a/mercurial/packagescan.py	Tue Aug 22 10:20:21 2006 +0200
+++ b/mercurial/packagescan.py	Tue Aug 22 07:32:54 2006 -0700
@@ -25,6 +25,7 @@
     """ fake demandload function that collects the required modules
         foo            import foo
         foo bar        import foo, bar
+        foo@bar        import foo as bar
         foo.bar        import foo.bar
         foo:bar        from foo import bar
         foo:bar,quux   from foo import bar, quux
@@ -38,6 +39,8 @@
         except:
             module = m
             fromlist = []
+        if '@' in module:
+            module, as_ = module.split('@')
         mod = __import__(module, scope, scope, fromlist)
         if fromlist == []:
             # mod is only the top package, but we need all packages