I'm afraid I can't merge this as-is because 2.x is still the primary use-case, and some of these changes aren't compatible with Python pre-2.5, and I know of a few deployments that still need to support 2.3 and 2.4.
I'll incorporate what I can this week, though (I should start having free time again after Wednesday), and try to make sure what can't be patched to work in both specs can at least be handled by 2to3.
I'm afraid I can't merge this as-is because 2.x is still the primary use-case, and some of these changes aren't compatible with Python pre-2.5, and I know of a few deployments that still need to support 2.3 and 2.4.
I'll incorporate what I can this week, though (I should start having free time again after Wednesday), and try to make sure what can't be patched to work in both specs can at least be handled by 2to3.