Branch merge

Doc/library/email.headerregistry.rst

@@ -16,7 +16,7 @@
    necessary by the core developers.
 
 .. versionadded:: 3.3
-   as a :term:`provisional module <provisional package>`
+   as a :term:`provisional module <provisional package>`.
 
 Headers are represented by customized subclasses of :class:`str`.  The
 particular class used to represent a given header is determined by the

Doc/whatsnew/3.3.rst

@@ -48,7 +48,7 @@
 
 This article explains the new features in Python 3.3, compared to 3.2.
 
-.. note:: Alpha users should be aware that this document is currently in
+.. note:: Beta users should be aware that this document is currently in
    draft form. It will be updated substantially as Python 3.3 moves towards
    release, so it's worth checking back even after reading earlier versions.
 

Lib/test/test__locale.py

@@ -12,7 +12,7 @@ from platform import uname
 from test.support import run_unittest
 
 if uname()[0] == "Darwin":
-    maj, min, mic = [int(part) for part in uname().release.split(".")]
+    maj, min, mic = [int(part) for part in uname()[2].split(".")]
     if (maj, min, mic) < (8, 0, 0):
         raise unittest.SkipTest("locale support broken for OS X < 10.4")