Fix some more has_key() uses. This could really use a tool to automate...
diff --git a/Lib/xml/sax/__init__.py b/Lib/xml/sax/__init__.py
index 054064c..d55ffb7 100644
--- a/Lib/xml/sax/__init__.py
+++ b/Lib/xml/sax/__init__.py
@@ -59,7 +59,7 @@
import xml.sax.expatreader
import os, sys
-if os.environ.has_key("PY_SAX_PARSER"):
+if "PY_SAX_PARSER" in os.environ:
default_parser_list = os.environ["PY_SAX_PARSER"].split(",")
del os
@@ -81,7 +81,7 @@
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 1cade65..1763ea4 100644
--- a/Lib/xml/sax/xmlreader.py
+++ b/Lib/xml/sax/xmlreader.py
@@ -294,12 +294,12 @@
return self._attrs[name]
def getNameByQName(self, name):
- if not self._attrs.has_key(name):
+ if name not in self._attrs:
raise KeyError, name
return name
def getQNameByName(self, name):
- if not self._attrs.has_key(name):
+ if name not in self._attrs:
raise KeyError, name
return name
@@ -318,11 +318,8 @@
def keys(self):
return self._attrs.keys()
- def has_key(self, name):
- return self._attrs.has_key(name)
-
def __contains__(self, name):
- return self._attrs.has_key(name)
+ return name in self._attrs
def get(self, name, alternative=None):
return self._attrs.get(name, alternative)