[Python-3000] to be merged

[Benjamin Peterson]

P.S. Can people please remember to block commits that shouldn't be
merged into 3.0? (Or even better, merge the ones you make that
should.) I feel rather nervous deciding whether something should be
merged or not when it's an edge case.


-- 
Cheers,
Benjamin Peterson
"There's no place like 127.0.0.1."