From 6cefeb0e8156406ac3f99248f6a3d3cd1536ca23 Mon Sep 17 00:00:00 2001 From: Alex Martelli Date: Mon, 21 Aug 2006 23:45:19 +0000 Subject: [PATCH] Jacques Frechet's and John Reese's simplification of ElementTree: give up attempts at backwards compatibility which can't work anyway on Py3k (and aren't needed for Python 2.5 and later). --- Lib/xml/etree/ElementTree.py | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index deaed7d27be..e03e2970502 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -111,33 +111,7 @@ __all__ = [ import string, sys, re -class _SimpleElementPath: - # emulate pre-1.2 find/findtext/findall behaviour - def find(self, element, tag): - for elem in element: - if elem.tag == tag: - return elem - return None - def findtext(self, element, tag, default=None): - for elem in element: - if elem.tag == tag: - return elem.text or "" - return default - def findall(self, element, tag): - if tag[:3] == ".//": - return element.getiterator(tag[3:]) - result = [] - for elem in element: - if elem.tag == tag: - result.append(elem) - return result - -try: - from . import ElementPath -except ImportError: - # FIXME: issue warning in this case? - # TODO: DEFINITELY issue warning here!!! - ElementPath = _SimpleElementPath() +from . import ElementPath # TODO: add support for custom namespace resolvers/default namespaces # TODO: add improved support for incremental parsing