Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line
#9424: Replace deprecated assert* methods in the Python test suite.
........
diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
index 2280058..adb9305 100644
--- a/Lib/test/test_sax.py
+++ b/Lib/test/test_sax.py
@@ -29,16 +29,16 @@
self.assertRaises(KeyError, attrs.getNameByQName, "attr")
self.assertRaises(KeyError, attrs.getQNameByName, "attr")
self.assertRaises(KeyError, attrs.__getitem__, "attr")
- self.assertEquals(attrs.getLength(), 0)
- self.assertEquals(attrs.getNames(), [])
- self.assertEquals(attrs.getQNames(), [])
- self.assertEquals(len(attrs), 0)
+ self.assertEqual(attrs.getLength(), 0)
+ self.assertEqual(attrs.getNames(), [])
+ self.assertEqual(attrs.getQNames(), [])
+ self.assertEqual(len(attrs), 0)
self.assertFalse(attrs.has_key("attr"))
- self.assertEquals(attrs.keys(), [])
- self.assertEquals(attrs.get("attrs"), None)
- self.assertEquals(attrs.get("attrs", 25), 25)
- self.assertEquals(attrs.items(), [])
- self.assertEquals(attrs.values(), [])
+ self.assertEqual(attrs.keys(), [])
+ self.assertEqual(attrs.get("attrs"), None)
+ self.assertEqual(attrs.get("attrs", 25), 25)
+ self.assertEqual(attrs.items(), [])
+ self.assertEqual(attrs.values(), [])
def verify_empty_nsattrs(self, attrs):
self.assertRaises(KeyError, attrs.getValue, (ns_uri, "attr"))
@@ -46,33 +46,33 @@
self.assertRaises(KeyError, attrs.getNameByQName, "ns:attr")
self.assertRaises(KeyError, attrs.getQNameByName, (ns_uri, "attr"))
self.assertRaises(KeyError, attrs.__getitem__, (ns_uri, "attr"))
- self.assertEquals(attrs.getLength(), 0)
- self.assertEquals(attrs.getNames(), [])
- self.assertEquals(attrs.getQNames(), [])
- self.assertEquals(len(attrs), 0)
+ self.assertEqual(attrs.getLength(), 0)
+ self.assertEqual(attrs.getNames(), [])
+ self.assertEqual(attrs.getQNames(), [])
+ self.assertEqual(len(attrs), 0)
self.assertFalse(attrs.has_key((ns_uri, "attr")))
- self.assertEquals(attrs.keys(), [])
- self.assertEquals(attrs.get((ns_uri, "attr")), None)
- self.assertEquals(attrs.get((ns_uri, "attr"), 25), 25)
- self.assertEquals(attrs.items(), [])
- self.assertEquals(attrs.values(), [])
+ self.assertEqual(attrs.keys(), [])
+ self.assertEqual(attrs.get((ns_uri, "attr")), None)
+ self.assertEqual(attrs.get((ns_uri, "attr"), 25), 25)
+ self.assertEqual(attrs.items(), [])
+ self.assertEqual(attrs.values(), [])
def verify_attrs_wattr(self, attrs):
- self.assertEquals(attrs.getLength(), 1)
- self.assertEquals(attrs.getNames(), ["attr"])
- self.assertEquals(attrs.getQNames(), ["attr"])
- self.assertEquals(len(attrs), 1)
+ self.assertEqual(attrs.getLength(), 1)
+ self.assertEqual(attrs.getNames(), ["attr"])
+ self.assertEqual(attrs.getQNames(), ["attr"])
+ self.assertEqual(len(attrs), 1)
self.assertTrue(attrs.has_key("attr"))
- self.assertEquals(attrs.keys(), ["attr"])
- self.assertEquals(attrs.get("attr"), "val")
- self.assertEquals(attrs.get("attr", 25), "val")
- self.assertEquals(attrs.items(), [("attr", "val")])
- self.assertEquals(attrs.values(), ["val"])
- self.assertEquals(attrs.getValue("attr"), "val")
- self.assertEquals(attrs.getValueByQName("attr"), "val")
- self.assertEquals(attrs.getNameByQName("attr"), "attr")
- self.assertEquals(attrs["attr"], "val")
- self.assertEquals(attrs.getQNameByName("attr"), "attr")
+ self.assertEqual(attrs.keys(), ["attr"])
+ self.assertEqual(attrs.get("attr"), "val")
+ self.assertEqual(attrs.get("attr", 25), "val")
+ self.assertEqual(attrs.items(), [("attr", "val")])
+ self.assertEqual(attrs.values(), ["val"])
+ self.assertEqual(attrs.getValue("attr"), "val")
+ self.assertEqual(attrs.getValueByQName("attr"), "val")
+ self.assertEqual(attrs.getNameByQName("attr"), "attr")
+ self.assertEqual(attrs["attr"], "val")
+ self.assertEqual(attrs.getQNameByName("attr"), "attr")
class MakeParserTest(unittest.TestCase):
def test_make_parser2(self):
@@ -102,47 +102,47 @@
class SaxutilsTest(unittest.TestCase):
# ===== escape
def test_escape_basic(self):
- self.assertEquals(escape("Donald Duck & Co"), "Donald Duck & Co")
+ self.assertEqual(escape("Donald Duck & Co"), "Donald Duck & Co")
def test_escape_all(self):
- self.assertEquals(escape("<Donald Duck & Co>"),
- "<Donald Duck & Co>")
+ self.assertEqual(escape("<Donald Duck & Co>"),
+ "<Donald Duck & Co>")
def test_escape_extra(self):
- self.assertEquals(escape("Hei på deg", {"å" : "å"}),
- "Hei på deg")
+ self.assertEqual(escape("Hei på deg", {"å" : "å"}),
+ "Hei på deg")
# ===== unescape
def test_unescape_basic(self):
- self.assertEquals(unescape("Donald Duck & Co"), "Donald Duck & Co")
+ self.assertEqual(unescape("Donald Duck & Co"), "Donald Duck & Co")
def test_unescape_all(self):
- self.assertEquals(unescape("<Donald Duck & Co>"),
- "<Donald Duck & Co>")
+ self.assertEqual(unescape("<Donald Duck & Co>"),
+ "<Donald Duck & Co>")
def test_unescape_extra(self):
- self.assertEquals(unescape("Hei på deg", {"å" : "å"}),
- "Hei på deg")
+ self.assertEqual(unescape("Hei på deg", {"å" : "å"}),
+ "Hei på deg")
def test_unescape_amp_extra(self):
- self.assertEquals(unescape("&foo;", {"&foo;": "splat"}), "&foo;")
+ self.assertEqual(unescape("&foo;", {"&foo;": "splat"}), "&foo;")
# ===== quoteattr
def test_quoteattr_basic(self):
- self.assertEquals(quoteattr("Donald Duck & Co"),
- '"Donald Duck & Co"')
+ self.assertEqual(quoteattr("Donald Duck & Co"),
+ '"Donald Duck & Co"')
def test_single_quoteattr(self):
- self.assertEquals(quoteattr('Includes "double" quotes'),
- '\'Includes "double" quotes\'')
+ self.assertEqual(quoteattr('Includes "double" quotes'),
+ '\'Includes "double" quotes\'')
def test_double_quoteattr(self):
- self.assertEquals(quoteattr("Includes 'single' quotes"),
- "\"Includes 'single' quotes\"")
+ self.assertEqual(quoteattr("Includes 'single' quotes"),
+ "\"Includes 'single' quotes\"")
def test_single_double_quoteattr(self):
- self.assertEquals(quoteattr("Includes 'single' and \"double\" quotes"),
- "\"Includes 'single' and "double" quotes\"")
+ self.assertEqual(quoteattr("Includes 'single' and \"double\" quotes"),
+ "\"Includes 'single' and "double" quotes\"")
# ===== make_parser
def test_make_parser(self):
@@ -164,7 +164,7 @@
gen.endElement("doc")
gen.endDocument()
- self.assertEquals(result.getvalue(), start + "<doc></doc>")
+ self.assertEqual(result.getvalue(), start + "<doc></doc>")
def test_xmlgen_content(self):
result = StringIO()
@@ -176,7 +176,7 @@
gen.endElement("doc")
gen.endDocument()
- self.assertEquals(result.getvalue(), start + "<doc>huhei</doc>")
+ self.assertEqual(result.getvalue(), start + "<doc>huhei</doc>")
def test_xmlgen_pi(self):
result = StringIO()
@@ -188,7 +188,7 @@
gen.endElement("doc")
gen.endDocument()
- self.assertEquals(result.getvalue(), start + "<?test data?><doc></doc>")
+ self.assertEqual(result.getvalue(), start + "<?test data?><doc></doc>")
def test_xmlgen_content_escape(self):
result = StringIO()
@@ -200,7 +200,7 @@
gen.endElement("doc")
gen.endDocument()
- self.assertEquals(result.getvalue(),
+ self.assertEqual(result.getvalue(),
start + "<doc><huhei&</doc>")
def test_xmlgen_attr_escape(self):
@@ -218,7 +218,7 @@
gen.endElement("doc")
gen.endDocument()
- self.assertEquals(result.getvalue(), start +
+ self.assertEqual(result.getvalue(), start +
("<doc a='\"'><e a=\"'\"></e>"
"<e a=\"'"\"></e>"
"<e a=\" 	\"></e></doc>"))
@@ -233,7 +233,7 @@
gen.endElement("doc")
gen.endDocument()
- self.assertEquals(result.getvalue(), start + "<doc> </doc>")
+ self.assertEqual(result.getvalue(), start + "<doc> </doc>")
def test_xmlgen_ns(self):
result = StringIO()
@@ -249,7 +249,7 @@
gen.endPrefixMapping("ns1")
gen.endDocument()
- self.assertEquals(result.getvalue(), start + \
+ self.assertEqual(result.getvalue(), start + \
('<ns1:doc xmlns:ns1="%s"><udoc></udoc></ns1:doc>' %
ns_uri))
@@ -262,7 +262,7 @@
gen.endElementNS((None, 'a'), 'a')
gen.endDocument()
- self.assertEquals(result.getvalue(), start+'<a b="c"></a>')
+ self.assertEqual(result.getvalue(), start+'<a b="c"></a>')
def test_1463026_2(self):
result = StringIO()
@@ -275,7 +275,7 @@
gen.endPrefixMapping(None)
gen.endDocument()
- self.assertEquals(result.getvalue(), start+'<a xmlns="qux"></a>')
+ self.assertEqual(result.getvalue(), start+'<a xmlns="qux"></a>')
def test_1463026_3(self):
result = StringIO()
@@ -288,7 +288,7 @@
gen.endPrefixMapping('my')
gen.endDocument()
- self.assertEquals(result.getvalue(),
+ self.assertEqual(result.getvalue(),
start+'<my:a xmlns:my="qux" b="c"></my:a>')
def test_5027_1(self):
@@ -311,11 +311,11 @@
parser.setContentHandler(gen)
parser.parse(test_xml)
- self.assertEquals(result.getvalue(),
- start + (
- '<a:g1 xmlns:a="http://example.com/ns">'
- '<a:g2 xml:lang="en">Hello</a:g2>'
- '</a:g1>'))
+ self.assertEqual(result.getvalue(),
+ start + (
+ '<a:g1 xmlns:a="http://example.com/ns">'
+ '<a:g2 xml:lang="en">Hello</a:g2>'
+ '</a:g1>'))
def test_5027_2(self):
# The xml prefix (as in xml:lang below) is reserved and bound by
@@ -339,11 +339,11 @@
gen.endPrefixMapping('a')
gen.endDocument()
- self.assertEquals(result.getvalue(),
- start + (
- '<a:g1 xmlns:a="http://example.com/ns">'
- '<a:g2 xml:lang="en">Hello</a:g2>'
- '</a:g1>'))
+ self.assertEqual(result.getvalue(),
+ start + (
+ '<a:g1 xmlns:a="http://example.com/ns">'
+ '<a:g2 xml:lang="en">Hello</a:g2>'
+ '</a:g1>'))
class XMLFilterBaseTest(unittest.TestCase):
@@ -360,7 +360,7 @@
filter.endElement("doc")
filter.endDocument()
- self.assertEquals(result.getvalue(), start + "<doc>content </doc>")
+ self.assertEqual(result.getvalue(), start + "<doc>content </doc>")
# ===========================================================================
#
@@ -382,7 +382,7 @@
parser.setContentHandler(xmlgen)
parser.parse(open(TEST_XMLFILE))
- self.assertEquals(result.getvalue(), xml_test_out)
+ self.assertEqual(result.getvalue(), xml_test_out)
# ===== DTDHandler support
@@ -410,9 +410,9 @@
parser.feed('<doc></doc>')
parser.close()
- self.assertEquals(handler._notations,
+ self.assertEqual(handler._notations,
[("GIF", "-//CompuServe//NOTATION Graphics Interchange Format 89a//EN", None)])
- self.assertEquals(handler._entities, [("img", None, "expat.gif", "GIF")])
+ self.assertEqual(handler._entities, [("img", None, "expat.gif", "GIF")])
# ===== EntityResolver support
@@ -435,8 +435,8 @@
parser.feed('<doc>&test;</doc>')
parser.close()
- self.assertEquals(result.getvalue(), start +
- "<doc><entity></entity></doc>")
+ self.assertEqual(result.getvalue(), start +
+ "<doc><entity></entity></doc>")
# ===== Attributes support
@@ -488,18 +488,18 @@
attrs = gather._attrs
- self.assertEquals(attrs.getLength(), 1)
- self.assertEquals(attrs.getNames(), [(ns_uri, "attr")])
+ self.assertEqual(attrs.getLength(), 1)
+ self.assertEqual(attrs.getNames(), [(ns_uri, "attr")])
self.assertTrue((attrs.getQNames() == [] or
attrs.getQNames() == ["ns:attr"]))
- self.assertEquals(len(attrs), 1)
+ self.assertEqual(len(attrs), 1)
self.assertTrue(attrs.has_key((ns_uri, "attr")))
- self.assertEquals(attrs.get((ns_uri, "attr")), "val")
- self.assertEquals(attrs.get((ns_uri, "attr"), 25), "val")
- self.assertEquals(attrs.items(), [((ns_uri, "attr"), "val")])
- self.assertEquals(attrs.values(), ["val"])
- self.assertEquals(attrs.getValue((ns_uri, "attr")), "val")
- self.assertEquals(attrs[(ns_uri, "attr")], "val")
+ self.assertEqual(attrs.get((ns_uri, "attr")), "val")
+ self.assertEqual(attrs.get((ns_uri, "attr"), 25), "val")
+ self.assertEqual(attrs.items(), [((ns_uri, "attr"), "val")])
+ self.assertEqual(attrs.values(), ["val"])
+ self.assertEqual(attrs.getValue((ns_uri, "attr")), "val")
+ self.assertEqual(attrs[(ns_uri, "attr")], "val")
# ===== InputSource support
@@ -511,7 +511,7 @@
parser.setContentHandler(xmlgen)
parser.parse(TEST_XMLFILE)
- self.assertEquals(result.getvalue(), xml_test_out)
+ self.assertEqual(result.getvalue(), xml_test_out)
def test_expat_inpsource_sysid(self):
parser = create_parser()
@@ -521,7 +521,7 @@
parser.setContentHandler(xmlgen)
parser.parse(InputSource(TEST_XMLFILE))
- self.assertEquals(result.getvalue(), xml_test_out)
+ self.assertEqual(result.getvalue(), xml_test_out)
def test_expat_inpsource_stream(self):
parser = create_parser()
@@ -533,7 +533,7 @@
inpsrc.setByteStream(open(TEST_XMLFILE))
parser.parse(inpsrc)
- self.assertEquals(result.getvalue(), xml_test_out)
+ self.assertEqual(result.getvalue(), xml_test_out)
# ===== IncrementalParser support
@@ -547,7 +547,7 @@
parser.feed("</doc>")
parser.close()
- self.assertEquals(result.getvalue(), start + "<doc></doc>")
+ self.assertEqual(result.getvalue(), start + "<doc></doc>")
def test_expat_incremental_reset(self):
result = StringIO()
@@ -568,7 +568,7 @@
parser.feed("</doc>")
parser.close()
- self.assertEquals(result.getvalue(), start + "<doc>text</doc>")
+ self.assertEqual(result.getvalue(), start + "<doc>text</doc>")
# ===== Locator support
@@ -582,9 +582,9 @@
parser.feed("</doc>")
parser.close()
- self.assertEquals(parser.getSystemId(), None)
- self.assertEquals(parser.getPublicId(), None)
- self.assertEquals(parser.getLineNumber(), 1)
+ self.assertEqual(parser.getSystemId(), None)
+ self.assertEqual(parser.getPublicId(), None)
+ self.assertEqual(parser.getLineNumber(), 1)
def test_expat_locator_withinfo(self):
result = StringIO()
@@ -593,8 +593,8 @@
parser.setContentHandler(xmlgen)
parser.parse(TEST_XMLFILE)
- self.assertEquals(parser.getSystemId(), TEST_XMLFILE)
- self.assertEquals(parser.getPublicId(), None)
+ self.assertEqual(parser.getSystemId(), TEST_XMLFILE)
+ self.assertEqual(parser.getPublicId(), None)
# ===========================================================================
@@ -615,7 +615,7 @@
parser.parse(source)
self.fail()
except SAXException, e:
- self.assertEquals(e.getSystemId(), name)
+ self.assertEqual(e.getSystemId(), name)
def test_expat_incomplete(self):
parser = create_parser()
@@ -679,21 +679,21 @@
attrs = AttributesNSImpl({(ns_uri, "attr") : "val"},
{(ns_uri, "attr") : "ns:attr"})
- self.assertEquals(attrs.getLength(), 1)
- self.assertEquals(attrs.getNames(), [(ns_uri, "attr")])
- self.assertEquals(attrs.getQNames(), ["ns:attr"])
- self.assertEquals(len(attrs), 1)
+ self.assertEqual(attrs.getLength(), 1)
+ self.assertEqual(attrs.getNames(), [(ns_uri, "attr")])
+ self.assertEqual(attrs.getQNames(), ["ns:attr"])
+ self.assertEqual(len(attrs), 1)
self.assertTrue(attrs.has_key((ns_uri, "attr")))
- self.assertEquals(attrs.keys(), [(ns_uri, "attr")])
- self.assertEquals(attrs.get((ns_uri, "attr")), "val")
- self.assertEquals(attrs.get((ns_uri, "attr"), 25), "val")
- self.assertEquals(attrs.items(), [((ns_uri, "attr"), "val")])
- self.assertEquals(attrs.values(), ["val"])
- self.assertEquals(attrs.getValue((ns_uri, "attr")), "val")
- self.assertEquals(attrs.getValueByQName("ns:attr"), "val")
- self.assertEquals(attrs.getNameByQName("ns:attr"), (ns_uri, "attr"))
- self.assertEquals(attrs[(ns_uri, "attr")], "val")
- self.assertEquals(attrs.getQNameByName((ns_uri, "attr")), "ns:attr")
+ self.assertEqual(attrs.keys(), [(ns_uri, "attr")])
+ self.assertEqual(attrs.get((ns_uri, "attr")), "val")
+ self.assertEqual(attrs.get((ns_uri, "attr"), 25), "val")
+ self.assertEqual(attrs.items(), [((ns_uri, "attr"), "val")])
+ self.assertEqual(attrs.values(), ["val"])
+ self.assertEqual(attrs.getValue((ns_uri, "attr")), "val")
+ self.assertEqual(attrs.getValueByQName("ns:attr"), "val")
+ self.assertEqual(attrs.getNameByQName("ns:attr"), (ns_uri, "attr"))
+ self.assertEqual(attrs[(ns_uri, "attr")], "val")
+ self.assertEqual(attrs.getQNameByName((ns_uri, "attr")), "ns:attr")
# During the development of Python 2.5, an attempt to move the "xml"
@@ -729,7 +729,7 @@
try:
import xml.sax.expatreader
module = xml.sax.expatreader
- self.assertEquals(module.__name__, "xml.sax.expatreader")
+ self.assertEqual(module.__name__, "xml.sax.expatreader")
finally:
sys.modules.update(old_modules)