diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_sax.py | 11 | ||||
| -rw-r--r-- | Lib/xml/sax/xmlreader.py | 12 |
2 files changed, 11 insertions, 12 deletions
diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py index 5715d67..fbe742d 100644 --- a/Lib/test/test_sax.py +++ b/Lib/test/test_sax.py @@ -358,11 +358,11 @@ def test_expat_nsattrs_wattr(): (attrs.getQNames() == [] or attrs.getQNames() == ["ns:attr"]) and \ len(attrs) == 1 and \ (ns_uri, "attr") in attrs and \ - attrs.keys() == [(ns_uri, "attr")] and \ + list(attrs.keys()) == [(ns_uri, "attr")] and \ attrs.get((ns_uri, "attr")) == "val" and \ attrs.get((ns_uri, "attr"), 25) == "val" and \ - attrs.items() == [((ns_uri, "attr"), "val")] and \ - attrs.values() == ["val"] and \ + list(attrs.items()) == [((ns_uri, "attr"), "val")] and \ + list(attrs.values()) == ["val"] and \ attrs.getValue((ns_uri, "attr")) == "val" and \ attrs[(ns_uri, "attr")] == "val" @@ -698,7 +698,7 @@ def test_sf_1511497(): # Bug report: http://www.python.org/sf/1511497 import sys old_modules = sys.modules.copy() - for modname in sys.modules.keys(): + for modname in list(sys.modules.keys()): if modname.startswith("xml."): del sys.modules[modname] try: @@ -734,8 +734,7 @@ def make_test_output(): outf.write(result.getvalue()) outf.close() -items = locals().items() -items.sort() +items = sorted(locals().items()) for (name, value) in items: if name[ : 5] == "test_": confirm(value(), name) diff --git a/Lib/xml/sax/xmlreader.py b/Lib/xml/sax/xmlreader.py index 1763ea4..4503315 100644 --- a/Lib/xml/sax/xmlreader.py +++ b/Lib/xml/sax/xmlreader.py @@ -304,10 +304,10 @@ class AttributesImpl: return name def getNames(self): - return self._attrs.keys() + return list(self._attrs.keys()) def getQNames(self): - return self._attrs.keys() + return list(self._attrs.keys()) def __len__(self): return len(self._attrs) @@ -316,7 +316,7 @@ class AttributesImpl: return self._attrs[name] def keys(self): - return self._attrs.keys() + return list(self._attrs.keys()) def __contains__(self, name): return name in self._attrs @@ -328,10 +328,10 @@ class AttributesImpl: return self.__class__(self._attrs) def items(self): - return self._attrs.items() + return list(self._attrs.items()) def values(self): - return self._attrs.values() + return list(self._attrs.values()) # ===== ATTRIBUTESNSIMPL ===== @@ -363,7 +363,7 @@ class AttributesNSImpl(AttributesImpl): return self._qnames[name] def getQNames(self): - return self._qnames.values() + return list(self._qnames.values()) def copy(self): return self.__class__(self._attrs, self._qnames) |