summaryrefslogtreecommitdiffstats
path: root/pym/portage/xml
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-04-13 19:47:13 -0700
committerZac Medico <zmedico@gentoo.org>2012-04-13 19:47:13 -0700
commit4fd43df42a9705bdb7681f4d67fb49b8da24a5d9 (patch)
tree9fa331a0e6244ede37effc81c20b724eb6444c9b /pym/portage/xml
parentef19d0fba35b1fff37257b70b3bd7c77b0b4e845 (diff)
downloadportage-4fd43df42a9705bdb7681f4d67fb49b8da24a5d9.tar.gz
portage-4fd43df42a9705bdb7681f4d67fb49b8da24a5d9.tar.bz2
portage-4fd43df42a9705bdb7681f4d67fb49b8da24a5d9.zip
Handle SystemError when importing xml libraries.
Diffstat (limited to 'pym/portage/xml')
-rw-r--r--pym/portage/xml/metadata.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py
index bed6a1e55..25f801a47 100644
--- a/pym/portage/xml/metadata.py
+++ b/pym/portage/xml/metadata.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Gentoo Foundation
+# Copyright 2010-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
"""Provides an easy-to-use python interface to Gentoo's metadata.xml file.
@@ -42,12 +42,12 @@ if sys.hexversion < 0x2070000 or \
else:
try:
import xml.etree.cElementTree as etree
- except ImportError:
+ except (ImportError, SystemError):
import xml.etree.ElementTree as etree
try:
from xml.parsers.expat import ExpatError
-except ImportError:
+except (ImportError, SystemError):
ExpatError = SyntaxError
import re