Merge lp:~gz/bzr/2.1_missing_ElementTree_254278 into lp:bzr/2.1
Proposed by
Martin Packman
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Vincent Ladeuil | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 4856 | ||||
Proposed branch: | lp:~gz/bzr/2.1_missing_ElementTree_254278 | ||||
Merge into: | lp:bzr/2.1 | ||||
Diff against target: |
27 lines (+6/-0) 2 files modified
NEWS (+4/-0) bzrlib/xml_serializer.py (+2/-0) |
||||
To merge this branch: | bzr merge lp:~gz/bzr/2.1_missing_ElementTree_254278 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+35120@code.launchpad.net |
Commit message
Prevent AttributeError in xml_serializer on certain cElementTree setups
Description of the change
Trying again to get this targeted at lp:bzr/2.1 rather than trunk...
One line fix for an old issue with ElementTree monkey-patching that can apparently still be hit in certain circumstances. I can't reproduce the problem myself, but confirmed on IRC that this change is sufficient, and the 2.3 approach of removing all that code entirely is not required.
To replay the fun as it happened, read:
<http://
To post a comment you must log in.
Ok, I'll land this one.
Yet, can you ensure this will get merged cleanly in 2.2 and dev ?
Ping me on IRC if you need help with that.