Merge lp://staging/~gholt/swift/python2.7compat into lp://staging/~hudson-openstack/swift/trunk

Proposed by gholt
Status: Merged
Approved by: David Goetz
Approved revision: 292
Merged at revision: 291
Proposed branch: lp://staging/~gholt/swift/python2.7compat
Merge into: lp://staging/~hudson-openstack/swift/trunk
Diff against target: 70 lines (+33/-2)
3 files modified
CHANGELOG (+2/-0)
swift/common/bufferedhttp.py (+2/-2)
test/unit/common/test_bufferedhttp.py (+29/-0)
To merge this branch: bzr merge lp://staging/~gholt/swift/python2.7compat
Reviewer Review Type Date Requested Status
David Goetz (community) Approve
John Dickinson Approve
Review via email: mp+60844@code.staging.launchpad.net

Description of the change

Fixed Python 2.7 compatibility problem

To post a comment you must log in.
Revision history for this message
John Dickinson (notmyname) wrote :

is there any issue with overriding bufferedhttp.HTTPSConnection in the test and not setting it back? Shouldn't it use some sort of save globals?

review: Needs Information
Revision history for this message
gholt (gholt) wrote :

Bleh, yes it should reset things. Fix for that pushed.

292. By gholt

Fixed unit test not restoring things to prepatched state

Revision history for this message
John Dickinson (notmyname) wrote :

LGTM

review: Approve
Revision history for this message
David Goetz (david-goetz) wrote :

looks good

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.