[Python-checkins] cpython (merge default -> default): Fix test__locale on Mac; platform.uname() does not have a structseq-type

[georg.brandl]

http://hg.python.org/cpython/rev/75b818d7c50d
changeset:   77730:75b818d7c50d
parent:      77728:f12a2f2c93e5
parent:      77729:7afc14f15c37
user:        Georg Brandl <georg at python.org>
date:        Sun Jun 24 19:29:49 2012 +0200
summary:
  Fix test__locale on Mac; platform.uname() does not have a structseq-type interface (yet).

files:
  Doc/library/email.headerregistry.rst |  2 +-
  Doc/whatsnew/3.3.rst                 |  2 +-
  Lib/test/test__locale.py             |  2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/email.headerregistry.rst b/Doc/library/email.headerregistry.rst
--- a/Doc/library/email.headerregistry.rst
+++ b/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
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/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.
 
diff --git a/Lib/test/test__locale.py b/Lib/test/test__locale.py
--- a/Lib/test/test__locale.py
+++ b/Lib/test/test__locale.py
@@ -12,7 +12,7 @@
 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")
 

-- 
Repository URL: http://hg.python.org/cpython