Commits

Floris Bruynooghe committed 6738f7d

Refresh for latest CVS head

  • Participants
  • Parent commits e6650eb

Comments (0)

Files changed (1)

zipmibsource_import

 # HG changeset patch
-# Parent 1b4c697e4965868773f1b353aa057bb029628d8b
+# Parent d34d41dbc5f6f37ea51637f8b7a34e73b74987ea
 # User Floris Bruynooghe <flub@devork.be>
 # Date 1324243064 -3600
 
  class __AbstractMibSource:
      def __init__(self, srcName):
          self._srcName = srcName
-@@ -96,9 +129,7 @@ class __AbstractMibSource:
+@@ -94,7 +127,7 @@ class __AbstractMibSource:
  class ZipMibSource(__AbstractMibSource):
      def _init(self):
          try:
--            p = __import__(
--                self._srcName, globals(), locals(), self._srcName.split('.')
--                )
+-            p = __import__(self._srcName, globals(), locals(), ['__init__'])
 +            p = import_module(self._srcName)
-             if hasattr(p, '__loader__'):
+             if hasattr(p, '__loader__') and hasattr(p.__loader__, '_files'):
                  self.__loader = p.__loader__
                  self._srcName = self._srcName.replace('.', os.sep)