Merge lp://staging/~jkakar/txaws/unbreak-error-wrapper into lp://staging/txaws

Proposed by Jamu Kakar
Status: Merged
Approved by: Thomas Herve
Approved revision: 81
Merged at revision: 81
Proposed branch: lp://staging/~jkakar/txaws/unbreak-error-wrapper
Merge into: lp://staging/txaws
Diff against target: 22 lines (+5/-3)
1 file modified
txaws/client/base.py (+5/-3)
To merge this branch: bzr merge lp://staging/~jkakar/txaws/unbreak-error-wrapper
Reviewer Review Type Date Requested Status
Thomas Herve Approve
Review via email: mp+57729@code.staging.launchpad.net

Description of the change

This branch introduces the following changes:

- 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.

Sorry for the noise. Apparently cowboys are not as great as ninjas. :/

To post a comment you must log in.
Revision history for this message
Thomas Herve (therve) wrote :

Looks great, +1!

And yay for ninjas.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: