Merge lp://staging/~smoser/python/lp-813295 into lp://staging/~doko/python/pkg2.7-debian

Proposed by Scott Moser
Status: Merged
Merge reported by: Scott Moser
Merged at revision: not available
Proposed branch: lp://staging/~smoser/python/lp-813295
Merge into: lp://staging/~doko/python/pkg2.7-debian
Diff against target: 64 lines (+52/-0)
2 files modified
patches/issue12576.diff (+51/-0)
patches/series.in (+1/-0)
To merge this branch: bzr merge lp://staging/~smoser/python/lp-813295
Reviewer Review Type Date Requested Status
Matthias Klose Pending
Review via email: mp+69491@code.staging.launchpad.net

Description of the change

This pulls in the upstream commit that fixed
 - upstream issue http://bugs.python.org/issue12576
 - ubuntu bug 813295

I'm not sure if merge proposals to this branch is how you'd want things submitted or not, but here it is.

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

Since this was pulled from the upstream changeset, it looks fine. However, I'm going to re-open the upstream because I think the change needs to be back ported to Python 2.7.

Revision history for this message
Barry Warsaw (barry) wrote :

Never mind. The change *was* applied to 2.7, but didn't get linked in the tracker.

Revision history for this message
Barry Warsaw (barry) wrote :

Doko says in private email to go ahead and apply/upload this patch to Ubuntu now. He'll sort out the delta with Debian later.

Revision history for this message
Barry Warsaw (barry) wrote :

Oh, in case it's not clear, I'm doing that now :)

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: