Commit 17d0ff6e authored by Jason R. Coombs's avatar Jason R. Coombs

Extract the additional trailing lines when a parent package is indicated.

parent ab7d8ee3
...@@ -60,16 +60,21 @@ class install_egg_info(Command): ...@@ -60,16 +60,21 @@ class install_egg_info(Command):
unpack_archive(self.source, self.target, skimmer) unpack_archive(self.source, self.target, skimmer)
_nspkg_tmpl = [ _nspkg_tmpl = (
"import sys, types, os", "import sys, types, os",
"p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)", "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)",
"ie = os.path.exists(os.path.join(p,'__init__.py'))", "ie = os.path.exists(os.path.join(p,'__init__.py'))",
"m = not ie and sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))", "m = not ie and sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
"mp = (m or []) and m.__dict__.setdefault('__path__',[])", "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
"(p not in mp) and mp.append(p)%(trailer)s", "(p not in mp) and mp.append(p)",
] )
"lines for the namespace installer" "lines for the namespace installer"
_nspkg_tmpl_multi = (
'm and setattr(sys.modules[%(parent)r], %(child)r, m)',
)
"additional line(s) when a parent package is indicated"
def install_namespaces(self): def install_namespaces(self):
nsp = self._get_all_ns_packages() nsp = self._get_all_ns_packages()
if not nsp: if not nsp:
...@@ -84,13 +89,11 @@ class install_egg_info(Command): ...@@ -84,13 +89,11 @@ class install_egg_info(Command):
# ensure pkg is not a unicode string under Python 2.7 # ensure pkg is not a unicode string under Python 2.7
pkg = str(pkg) pkg = str(pkg)
pth = tuple(pkg.split('.')) pth = tuple(pkg.split('.'))
trailer = '\n' tmpl_lines = self._nspkg_tmpl
if '.' in pkg: parent, sep, child = pkg.rpartition('.')
trailer = ( if parent:
"; m and setattr(sys.modules[%r], %r, m)\n" tmpl_lines += self._nspkg_tmpl_multi
% ('.'.join(pth[:-1]), pth[-1]) dat = ';'.join(tmpl_lines) % locals() + '\n'
)
dat = ';'.join(self._nspkg_tmpl) % locals()
f.write(dat) f.write(dat)
f.close() f.close()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment