Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-24 08:08:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Silence warnings under -3 about using dict.has_key() for modulefinder.

Browse source
This commit is contained in:
Brett Cannon 2008-08-04 00:27:29 +00:00
parent 5dd504df28
commit 9bd059ff4e
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/modulefinder.py
View file

@ -258,7 +258,7 @@ def import_module(self, partname, fqname, parent):
else:
self.msgout(3, "import_module ->", m)
return m
if self.badmodules.has_key(fqname):
if fqname in self.badmodules:
self.msgout(3, "import_module -> None")
return None
if parent and parent.__path__ is None:
@ -279,7 +279,8 @@ def import_module(self, partname, fqname, parent):
self.msgout(3, "import_module ->", m)
return m
def load_module(self, fqname, fp, pathname, (suffix, mode, type)):
def load_module(self, fqname, fp, pathname, file_info):
suffix, mode, type = file_info
self.msgin(2, "load_module", fqname, fp and "fp", pathname)
if type == imp.PKG_DIRECTORY:
m = self.load_package(fqname, pathname)
@ -460,7 +461,7 @@ def load_package(self, fqname, pathname):
return m
def add_module(self, fqname):
if self.modules.has_key(fqname):
if fqname in self.modules:
return self.modules[fqname]
self.modules[fqname] = m = Module(fqname)
return m