From d7579ecd27ca051d7f987102caeb53e826a6fe93 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 31 Aug 2011 19:54:19 -0700 Subject: Revert "xml/metadata: implement XMLParser.doctype()" This reverts commit ce501b36d7078db059c606d3b4f38637ad09528e. This commit had lots of unintended changes included. --- pym/portage/xml/metadata.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'pym/portage/xml') diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py index 9e1886927..ef335e29f 100644 --- a/pym/portage/xml/metadata.py +++ b/pym/portage/xml/metadata.py @@ -36,19 +36,10 @@ except ImportError: import xml.etree.ElementTree as etree import re -import xml.etree.ElementTree import portage from portage import os from portage.util import unique_everseen -class _MetadataTreeBuilder(xml.etree.ElementTree.TreeBuilder): - """ - Implements doctype() as required to avoid deprecation warnings with - Python >=2.7. - """ - def doctype(self, name, pubid, system): - pass - class _Maintainer(object): """An object for representing one maintainer. @@ -182,8 +173,7 @@ class MetaDataXML(object): self._xml_tree = None try: - self._xml_tree = etree.parse(metadata_xml_path, - parser=etree.XMLParser(target=_MetadataTreeBuilder())) + self._xml_tree = etree.parse(metadata_xml_path) except ImportError: pass @@ -218,8 +208,7 @@ class MetaDataXML(object): if self._herdstree is None: try: - self._herdstree = etree.parse(self._herds_path, - parser=etree.XMLParser(target=_MetadataTreeBuilder())) + self._herdstree = etree.parse(self._herds_path) except (ImportError, IOError, SyntaxError): return None -- cgit v1.2.3-1-g7c22