Commit 091153d4 authored by Guido van Rossum's avatar Guido van Rossum

Make test_sax pass.

parent 87b63950
...@@ -358,11 +358,11 @@ def test_expat_nsattrs_wattr(): ...@@ -358,11 +358,11 @@ def test_expat_nsattrs_wattr():
(attrs.getQNames() == [] or attrs.getQNames() == ["ns:attr"]) and \ (attrs.getQNames() == [] or attrs.getQNames() == ["ns:attr"]) and \
len(attrs) == 1 and \ len(attrs) == 1 and \
(ns_uri, "attr") in attrs 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")) == "val" and \
attrs.get((ns_uri, "attr"), 25) == "val" and \ attrs.get((ns_uri, "attr"), 25) == "val" and \
attrs.items() == [((ns_uri, "attr"), "val")] and \ list(attrs.items()) == [((ns_uri, "attr"), "val")] and \
attrs.values() == ["val"] and \ list(attrs.values()) == ["val"] and \
attrs.getValue((ns_uri, "attr")) == "val" and \ attrs.getValue((ns_uri, "attr")) == "val" and \
attrs[(ns_uri, "attr")] == "val" attrs[(ns_uri, "attr")] == "val"
...@@ -698,7 +698,7 @@ def test_sf_1511497(): ...@@ -698,7 +698,7 @@ def test_sf_1511497():
# Bug report: http://www.python.org/sf/1511497 # Bug report: http://www.python.org/sf/1511497
import sys import sys
old_modules = sys.modules.copy() old_modules = sys.modules.copy()
for modname in sys.modules.keys(): for modname in list(sys.modules.keys()):
if modname.startswith("xml."): if modname.startswith("xml."):
del sys.modules[modname] del sys.modules[modname]
try: try:
...@@ -734,8 +734,7 @@ def make_test_output(): ...@@ -734,8 +734,7 @@ def make_test_output():
outf.write(result.getvalue()) outf.write(result.getvalue())
outf.close() outf.close()
items = locals().items() items = sorted(locals().items())
items.sort()
for (name, value) in items: for (name, value) in items:
if name[ : 5] == "test_": if name[ : 5] == "test_":
confirm(value(), name) confirm(value(), name)
......
...@@ -304,10 +304,10 @@ class AttributesImpl: ...@@ -304,10 +304,10 @@ class AttributesImpl:
return name return name
def getNames(self): def getNames(self):
return self._attrs.keys() return list(self._attrs.keys())
def getQNames(self): def getQNames(self):
return self._attrs.keys() return list(self._attrs.keys())
def __len__(self): def __len__(self):
return len(self._attrs) return len(self._attrs)
...@@ -316,7 +316,7 @@ class AttributesImpl: ...@@ -316,7 +316,7 @@ class AttributesImpl:
return self._attrs[name] return self._attrs[name]
def keys(self): def keys(self):
return self._attrs.keys() return list(self._attrs.keys())
def __contains__(self, name): def __contains__(self, name):
return name in self._attrs return name in self._attrs
...@@ -328,10 +328,10 @@ class AttributesImpl: ...@@ -328,10 +328,10 @@ class AttributesImpl:
return self.__class__(self._attrs) return self.__class__(self._attrs)
def items(self): def items(self):
return self._attrs.items() return list(self._attrs.items())
def values(self): def values(self):
return self._attrs.values() return list(self._attrs.values())
# ===== ATTRIBUTESNSIMPL ===== # ===== ATTRIBUTESNSIMPL =====
...@@ -363,7 +363,7 @@ class AttributesNSImpl(AttributesImpl): ...@@ -363,7 +363,7 @@ class AttributesNSImpl(AttributesImpl):
return self._qnames[name] return self._qnames[name]
def getQNames(self): def getQNames(self):
return self._qnames.values() return list(self._qnames.values())
def copy(self): def copy(self):
return self.__class__(self._attrs, self._qnames) return self.__class__(self._attrs, self._qnames)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment