Changeset 391 for python/trunk/Lib/test/test_xmllib.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_xmllib.py (modified) (2 diffs)

python/trunk/Lib/test/test_xmllib.py

@@ -16 +16 @@
 nsdoc = "<foo xmlns='URI' attr='val'/>"
 
-import warnings
-warnings.filterwarnings("ignore", ".* xmllib .* obsolete.*",
-                        DeprecationWarning, r'xmllib$')
-
 from test import test_support
 import unittest
-import xmllib
+# Silence Py3k warning
+xmllib = test_support.import_module('xmllib', deprecated=True)
 
 class XMLParserTestCase(unittest.TestCase):
@@ -40 +37 @@
         h.close()
         # The default namespace applies to elements...
-        self.assertEquals(h.name, "URI foo")
+        self.assertEqual(h.name, "URI foo")
         # but not to attributes
-        self.assertEquals(h.attr, {'attr':'val'})
+        self.assertEqual(h.attr, {'attr':'val'})