Remove dict.has_key() usage in xml.sax to silence warnings under -3.

diff --git a/Lib/xml/sax/__init__.py b/Lib/xml/sax/__init__.py
index 6b1b1ba00712e4f3166eb680baba574d8ab6a2fb..73ec9291ab95b930e81b7bbf94c254ad8f639099 100644 (file)
--- a/Lib/xml/sax/__init__.py
+++ b/Lib/xml/sax/__init__.py
@@ -81,7 +81,7 @@ def make_parser(parser_list = []):
             return _create_parser(parser_name)
         except ImportError,e:
             import sys
-            if sys.modules.has_key(parser_name):
+            if parser_name in sys.modules:
                 # The parser module was found, but importing it
                 # failed unexpectedly, pass this exception through
                 raise

diff --git a/Lib/xml/sax/xmlreader.py b/Lib/xml/sax/xmlreader.py
index 9a2361e349d0a33b50cc06c80ededa2b3c4e5947..8e230841f694282e9bedf566f81180fad41824a1 100644 (file)
--- a/Lib/xml/sax/xmlreader.py
+++ b/Lib/xml/sax/xmlreader.py
@@ -294,12 +294,12 @@ class AttributesImpl:
         return self._attrs[name]
 
     def getNameByQName(self, name):
-        if not self._attrs.has_key(name):
+        if not name in self._attrs:
             raise KeyError, name
         return name
 
     def getQNameByName(self, name):
-        if not self._attrs.has_key(name):
+        if not name in self._attrs:
             raise KeyError, name
         return name
 
@@ -319,7 +319,7 @@ class AttributesImpl:
         return self._attrs.keys()
 
     def has_key(self, name):
-        return self._attrs.has_key(name)
+        return name in self._attrs
 
     def __contains__(self, name):
         return self._attrs.has_key(name)