mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-18 04:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Cleanup more old ET library leftovers

Browse source
This commit is contained in:
Eli Bendersky 2013-05-19 09:24:43 -07:00
parent 46955b2d30
commit c4e98a6a9b
2 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_xml_etree.py
View file

@ -240,7 +240,6 @@ class ElementTreeTest(unittest.TestCase):
self.assertEqual(ET.XML, ET.fromstring) self.assertEqual(ET.XML, ET.fromstring)
self.assertEqual(ET.PI, ET.ProcessingInstruction) self.assertEqual(ET.PI, ET.ProcessingInstruction)
self.assertEqual(ET.XMLParser, ET.XMLTreeBuilder)
def test_simpleops(self): def test_simpleops(self):
# Basic method sanity checks. # Basic method sanity checks.
@ -433,15 +432,6 @@ class ElementTreeTest(unittest.TestCase):
' <empty-element />\n' ' <empty-element />\n'
'</root>') '</root>')
parser = ET.XMLTreeBuilder() # 1.2 compatibility
parser.feed(data)
self.serialize_check(parser.close(),
'<root>\n'
' <element key="value">text</element>\n'
' <element>text</element>tail\n'
' <empty-element />\n'
'</root>')
target = ET.TreeBuilder() target = ET.TreeBuilder()
parser = ET.XMLParser(target=target) parser = ET.XMLParser(target=target)
parser.feed(data) parser.feed(data)
@ -1407,7 +1397,7 @@ class BugsTest(unittest.TestCase):
# Don't crash when using custom entities. # Don't crash when using custom entities.
ENTITIES = {'rsquo': '\u2019', 'lsquo': '\u2018'} ENTITIES = {'rsquo': '\u2019', 'lsquo': '\u2018'}
parser = ET.XMLTreeBuilder() parser = ET.XMLParser()
parser.entity.update(ENTITIES) parser.entity.update(ENTITIES)
parser.feed("""<?xml version="1.0" encoding="UTF-8"?> parser.feed("""<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE patent-application-publication SYSTEM "pap-v15-2001-01-31.dtd" []> <!DOCTYPE patent-application-publication SYSTEM "pap-v15-2001-01-31.dtd" []>

11
Lib/xml/etree/ElementTree.py
View file

@ -85,7 +85,7 @@ __all__ = [
"TreeBuilder", "TreeBuilder",
"VERSION", "VERSION",
"XML", "XMLID", "XML", "XMLID",
"XMLParser", "XMLTreeBuilder", "XMLParser",
"register_namespace", "register_namespace",
] ]
@ -1654,9 +1654,7 @@ try:
# Element, SubElement, ParseError, TreeBuilder, XMLParser # Element, SubElement, ParseError, TreeBuilder, XMLParser
from _elementtree import * from _elementtree import *
except ImportError:
pass
else:
# Overwrite 'ElementTree.parse' to use the C XMLParser # Overwrite 'ElementTree.parse' to use the C XMLParser
class ElementTree(ElementTree): class ElementTree(ElementTree):
__doc__ = ElementTree.__doc__ __doc__ = ElementTree.__doc__
@ -1681,11 +1679,10 @@ else:
finally: finally:
if close_source: if close_source:
source.close() source.close()
except ImportError:
pass
# compatibility
XMLTreeBuilder = XMLParser
# workaround circular import. # workaround circular import.
try: try:
from ElementC14N import _serialize_c14n from ElementC14N import _serialize_c14n