← Back to branch summary

~jkakar/txaws/silence-deprecation-warnings

« back to all changes in this revision

Viewing changes to txaws/client/base.py

  • Committer: Jamu Kakar
  • Date: 2011-04-14 17:46:54 UTC
  • mfrom: (80.1.1 unbreak-error-wrapper)
  • Revision ID: jkakar@kakar.ca-20110414174654-1irv3tg0fdvng3ty
Merged unbreak-error-wrapper [r=therve] [f=760878]

xml.etree.ElementTree.ParseError is conditionally imported with a
fallback to xml.parsers.expat.ExpatError if it isn't available.  This
unbreaks error_wrapper on <python2.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
txaws/client/base.py
1
 
from xml.etree.ElementTree import ParseError
2
 
from xml.parsers.expat import ExpatError
 
1
try:
 
2
    from xml.etree.ElementTree import ParseError
 
3
except ImportError:
 
4
    from xml.parsers.expat import ExpatError as ParseError
3
5
 
4
6
from twisted.internet import reactor, ssl
5
7
from twisted.web import http
37
39
            fallback_error = errorClass(
38
40
                xml_payload, error.value.status, error.value.message,
39
41
                error.value.response)
40
 
        except (ExpatError, ParseError, AWSResponseParseError):
 
42
        except (ParseError, AWSResponseParseError):
41
43
            error_message = http.RESPONSES.get(http_status)
42
44
            fallback_error = TwistedWebError(
43
45
                http_status, error_message, error.value.response)