diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-06-04 14:59:12 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-04 14:59:12 -0700 |
| commit | ee3bf6f9773c0afbd494c657d253241f79d98044 (patch) | |
| tree | 7ebb0d78586e80d97255ec363ba24db7fb1ea5c4 /pym/portage/xml | |
| parent | de996b1dd411bc2bc0363890dc284534d747174e (diff) | |
| download | portage-ee3bf6f9773c0afbd494c657d253241f79d98044.tar.gz portage-ee3bf6f9773c0afbd494c657d253241f79d98044.tar.bz2 portage-ee3bf6f9773c0afbd494c657d253241f79d98044.zip | |
Handle more import exceptions involving xml.
See http://bugs.python.org/issue14988
Diffstat (limited to 'pym/portage/xml')
| -rw-r--r-- | pym/portage/xml/metadata.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py index 25f801a47..f820e5414 100644 --- a/pym/portage/xml/metadata.py +++ b/pym/portage/xml/metadata.py @@ -42,12 +42,18 @@ if sys.hexversion < 0x2070000 or \ else: try: import xml.etree.cElementTree as etree - except (ImportError, SystemError): + except (SystemExit, KeyboardInterrupt): + raise + except (ImportError, SystemError, RuntimeError, Exception): + # broken or missing xml support + # http://bugs.python.org/issue14988 import xml.etree.ElementTree as etree try: from xml.parsers.expat import ExpatError -except (ImportError, SystemError): +except (SystemExit, KeyboardInterrupt): + raise +except (ImportError, SystemError, RuntimeError, Exception): ExpatError = SyntaxError import re |