mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Fix some more has_key() uses. This could really use a tool to automate...

Browse source
This commit is contained in:
Guido van Rossum 2006-08-19 02:45:06 +00:00
parent 5c303dec17
commit 1b01e5c706
6 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/xml/sax/__init__.py
View file

@ -59,7 +59,7 @@ if _false:
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 @@ 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

9
Lib/xml/sax/xmlreader.py
View file

@ -294,12 +294,12 @@ class AttributesImpl:
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 @@ class AttributesImpl:
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)