From: Brett Cannon <bcannon@gmail.com>
Date: Mon, 4 Aug 2008 00:27:29 +0000 (+0000)
Subject: Silence warnings under -3 about using dict.has_key() for modulefinder.
X-Git-Tag: v2.6b3~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bd059ff4eecfb10b56a04e611b4ddfd87cc1dab;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index 34d15b8bb372..ad6a644e1e6c 100644
--- a/Lib/modulefinder.py
+++ b/Lib/modulefinder.py
@@ -258,7 +258,7 @@ class ModuleFinder:
         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 @@ class ModuleFinder:
         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 @@ class ModuleFinder:
         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