mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
Get rid of dict.has_key(). Boy this has a lot of repercussions!
Not all code has been fixed yet; this is just a checkpoint... The C API still has PyDict_HasKey() and _HasKeyString(); not sure if I want to change those just yet.
This commit is contained in:
parent
d2dbecb4ae
commit
e2b70bcf74
93 changed files with 215 additions and 313 deletions
|
@ -357,7 +357,7 @@ def test_expat_nsattrs_wattr():
|
|||
attrs.getNames() == [(ns_uri, "attr")] and \
|
||||
(attrs.getQNames() == [] or attrs.getQNames() == ["ns:attr"]) and \
|
||||
len(attrs) == 1 and \
|
||||
attrs.has_key((ns_uri, "attr")) and \
|
||||
(ns_uri, "attr") in attrs and \
|
||||
attrs.keys() == [(ns_uri, "attr")] and \
|
||||
attrs.get((ns_uri, "attr")) == "val" and \
|
||||
attrs.get((ns_uri, "attr"), 25) == "val" and \
|
||||
|
@ -571,7 +571,7 @@ def verify_empty_attrs(attrs):
|
|||
attrs.getNames() == [] and \
|
||||
attrs.getQNames() == [] and \
|
||||
len(attrs) == 0 and \
|
||||
not attrs.has_key("attr") and \
|
||||
"attr" not in attrs and \
|
||||
attrs.keys() == [] and \
|
||||
attrs.get("attrs") is None and \
|
||||
attrs.get("attrs", 25) == 25 and \
|
||||
|
@ -584,7 +584,7 @@ def verify_attrs_wattr(attrs):
|
|||
attrs.getNames() == ["attr"] and \
|
||||
attrs.getQNames() == ["attr"] and \
|
||||
len(attrs) == 1 and \
|
||||
attrs.has_key("attr") and \
|
||||
"attr" in attrs and \
|
||||
attrs.keys() == ["attr"] and \
|
||||
attrs.get("attr") == "val" and \
|
||||
attrs.get("attr", 25) == "val" and \
|
||||
|
@ -639,7 +639,7 @@ def verify_empty_nsattrs(attrs):
|
|||
attrs.getNames() == [] and \
|
||||
attrs.getQNames() == [] and \
|
||||
len(attrs) == 0 and \
|
||||
not attrs.has_key((ns_uri, "attr")) and \
|
||||
(ns_uri, "attr") not in attrs and \
|
||||
attrs.keys() == [] and \
|
||||
attrs.get((ns_uri, "attr")) is None and \
|
||||
attrs.get((ns_uri, "attr"), 25) == 25 and \
|
||||
|
@ -658,7 +658,7 @@ def test_nsattrs_wattr():
|
|||
attrs.getNames() == [(ns_uri, "attr")] and \
|
||||
attrs.getQNames() == ["ns:attr"] and \
|
||||
len(attrs) == 1 and \
|
||||
attrs.has_key((ns_uri, "attr")) and \
|
||||
(ns_uri, "attr") in attrs and \
|
||||
attrs.keys() == [(ns_uri, "attr")] and \
|
||||
attrs.get((ns_uri, "attr")) == "val" and \
|
||||
attrs.get((ns_uri, "attr"), 25) == "val" and \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue