comparison mercurial/demandimport.py @ 12801:cddea24aafed stable

demandimport: backout fe31f834a9ff Using a keyword argument here breaks zipimporter for at least some versions of Python2.6 on Windows.
author Steve Borho <steve@borho.org>
date Thu, 21 Oct 2010 10:13:03 -0500
parents fe31f834a9ff
children bc91a79fa3d0
comparison
equal deleted inserted replaced
12800:598bf07fc896 12801:cddea24aafed
43 self._data[3].append(name) 43 self._data[3].append(name)
44 def _load(self): 44 def _load(self):
45 if not self._module: 45 if not self._module:
46 head, globals, locals, after, level = self._data 46 head, globals, locals, after, level = self._data
47 if level is not None: 47 if level is not None:
48 mod = _origimport(head, globals, locals, level=level) 48 mod = _origimport(head, globals, locals, level)
49 else: 49 else:
50 mod = _origimport(head, globals, locals) 50 mod = _origimport(head, globals, locals)
51 # load submodules 51 # load submodules
52 def subload(mod, p): 52 def subload(mod, p):
53 h, t = p, None 53 h, t = p, None