← Back to branch summary

~pythonregexp2.7/python/issue2636-09-01+10

« back to all changes in this revision

Viewing changes to Lib/modulefinder.py

  • Committer: Jeffrey C. "The TimeHorse" Jacobs
  • Date: 2008-09-22 21:39:45 UTC
  • mfrom: (39055.1.33 Regexp-2.7)
  • Revision ID: darklord@timehorse.com-20080922213945-23717m5eiqpamcyn
Merged in changes from the Single-Loop Engine branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/modulefinder.py
258
258
        else:
259
259
            self.msgout(3, "import_module ->", m)
260
260
            return m
261
 
        if self.badmodules.has_key(fqname):
 
261
        if fqname in self.badmodules:
262
262
            self.msgout(3, "import_module -> None")
263
263
            return None
264
264
        if parent and parent.__path__ is None:
279
279
        self.msgout(3, "import_module ->", m)
280
280
        return m
281
281
 
282
 
    def load_module(self, fqname, fp, pathname, (suffix, mode, type)):
 
282
    def load_module(self, fqname, fp, pathname, file_info):
 
283
        suffix, mode, type = file_info
283
284
        self.msgin(2, "load_module", fqname, fp and "fp", pathname)
284
285
        if type == imp.PKG_DIRECTORY:
285
286
            m = self.load_package(fqname, pathname)
460
461
        return m
461
462
 
462
463
    def add_module(self, fqname):
463
 
        if self.modules.has_key(fqname):
 
464
        if fqname in self.modules:
464
465
            return self.modules[fqname]
465
466
        self.modules[fqname] = m = Module(fqname)
466
467
        return m