Commits

Yuya Nishihara committed 32d6f01

move code for strip_init to common place

  • Participants
  • Parent commits 47ca4fe

Comments (0)

Files changed (1)

hgext/fixfrozenexts.py

 def _libpath():
     return os.path.join(os.path.dirname(sys.executable), 'library.zip')
 
-def _listzippedexts(zf, strip_init):
+def _listzippedexts(zf):
     """list up extensions in library.zip"""
     exts = {}
     for path in zf.namelist():
         name = m.group(1)
         if name in extensions._order or name == '__init__':
             continue
-        if strip_init and m.group(2):
-            path = path.rstrip('/__init__.pyo')
 
         exts[name] = path
 
     return exts
 
 @_cached
-def _disabledzippedpaths(strip_init=False):
+def _disabledzippedpaths():
     zf = zipfile.ZipFile(_libpath())
     try:
-        return _listzippedexts(zf, strip_init)
+        return _listzippedexts(zf)
     finally:
         zf.close()
 
 def _disabledpaths(orig, strip_init=False):
-    return _disabledzippedpaths(strip_init)
+    exts = _disabledzippedpaths()
+    if not strip_init:
+        return exts
+
+    for name, path in exts.iteritems():
+        if path.find('/__init__.py'):
+            exts[name] = os.path.dirname(path)
+    return exts
 
 def _extractzippeddoc(zf, path):
     """extract docstring from zipped *.pyo"""