changeset 1842:eff3496d153d

merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 06 Mar 2006 10:50:26 -0800
parents 7f12a63568ae (diff) d17f19d84fd3 (current diff)
children 986e9b109113
files
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/packagescan.py	Mon Mar 06 17:53:11 2006 +0100
+++ b/mercurial/packagescan.py	Mon Mar 06 10:50:26 2006 -0800
@@ -16,8 +16,14 @@
     """ fake demandload function that collects the required modules """
     for m in modules.split():
         mod = None
-        mod = __import__(m,scope,scope)
-        scope[m] = mod
+        try:
+            module, submodules = m.split(':')
+            submodules = submodules.split(',')
+        except:
+            module = m
+            submodules = []
+        mod = __import__(module, scope, scope, submodules)
+        scope[module] = mod
         requiredmodules[mod.__name__] = 1
 
 def getmodules(libpath,packagename):