Merged revisions 66337,66347,66350,66352,66358 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66337 | vinay.sajip | 2008-09-09 08:42:08 -0500 (Tue, 09 Sep 2008) | 1 line

  Issue #3809: Fixed spurious 'test.blah' file left behind by test_logging.
........
  r66347 | georg.brandl | 2008-09-09 14:26:00 -0500 (Tue, 09 Sep 2008) | 2 lines

  Fix varname in docstring. #3822.
........
  r66350 | georg.brandl | 2008-09-09 15:28:31 -0500 (Tue, 09 Sep 2008) | 2 lines

  #3472: update Mac-bundled Python version info.
........
  r66352 | benjamin.peterson | 2008-09-09 15:55:01 -0500 (Tue, 09 Sep 2008) | 4 lines

  Fix #3634 invalid return value from _weakref.ref(Exception).__init__

  Reviewers: Amaury, Antoine, Benjamin
........
  r66358 | benjamin.peterson | 2008-09-09 18:16:48 -0500 (Tue, 09 Sep 2008) | 1 line

  use the latest pygments version
........

diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
index 7da291450c0f050c5695cae32816325c2ab01a1f..052a489a951fab5481e8a76059fe7277682291e2 100644 (file)
--- a/Doc/using/mac.rst
+++ b/Doc/using/mac.rst
@@ -17,10 +17,10 @@ the IDE and the Package Manager that are worth pointing out.
 Getting and Installing MacPython
 ================================
 
-Mac OS X 10.5 comes with Python 2.5 pre-installed by Apple. However, you are
-encouraged to install the most recent version of Python from the Python website
-(http://www.python.org). A "universal binary" build of Python 2.5, which runs
-natively on the Mac's new Intel and legacy PPC CPU's, is available there.
+Mac OS X 10.5 comes with Python 2.5.1 pre-installed by Apple.  If you wish, you
+are invited to install the most recent version of Python from the Python website
+(http://www.python.org).  A current "universal binary" build of Python, which
+runs natively on the Mac's new Intel and legacy PPC CPU's, is available there.
 
 What you get after installing is a number of things:
 
@@ -38,7 +38,10 @@ What you get after installing is a number of things:
 The Apple-provided build of Python is installed in
 :file:`/System/Library/Frameworks/Python.framework` and :file:`/usr/bin/python`,
 respectively. You should never modify or delete these, as they are
-Apple-controlled and are used by Apple- or third-party software.
+Apple-controlled and are used by Apple- or third-party software.  Remember that
+if you choose to install a newer Python version from python.org, you will have
+two different but functional Python installations on your computer, so it will
+be important that your paths and usages are consistent with what you want to do.
 
 IDLE includes a help menu that allows you to access Python documentation. If you
 are completely new to Python you should start reading the tutorial introduction

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 75d1366b6c059b04b75688caee3b10754881a715..c99a650ca8d66bb68336da43310ce66e697d43b4 100644 (file)
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -615,10 +615,10 @@ class ConfigFileTest(BaseTest):
     args=(sys.stdout,)
 
     [handler_hand2]
-    class=FileHandler
+    class=StreamHandler
     level=NOTSET
     formatter=form1
-    args=('test.blah', 'a')
+    args=(sys.stderr,)
 
     [formatter_form1]
     format=%(levelname)s ++ %(message)s

diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index 108cd7f66c4e8c05d7d8474461c19bb0649a003b..9821e1ba759864ab692fe04c2db039db3e55a1be 100644 (file)
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -660,6 +660,14 @@ class ReferencesTestCase(TestBase):
 
         w = Target()
 
+    def test_init(self):
+        # Issue 3634
+        # <weakref to class>.__init__() doesn't check errors correctly
+        r = weakref.ref(Exception)
+        self.assertRaises(TypeError, r.__init__, 0, 0, 0, 0, 0)
+        # No exception should be raised here
+        gc.collect()
+
 
 class SubclassableWeakrefTestCase(TestBase):
 

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 66f617e43a9018b2c5c1ca3caecb1665b2d3c3cf..60cd9578040058c8c3d26ca28c7e9b0ea098cb07 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8190,8 +8190,8 @@ unicode_upper(PyUnicodeObject *self)
 PyDoc_STRVAR(zfill__doc__,
 "S.zfill(width) -> str\n\
 \n\
-Pad a numeric string x with zeros on the left, to fill a field\n\
-of the specified width. The string x is never truncated.");
+Pad a numeric string S with zeros on the left, to fill a field\n\
+of the specified width. The string S is never truncated.");
 
 static PyObject *
 unicode_zfill(PyUnicodeObject *self, PyObject *args)

diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 83e63fc4f5aa3ea8e3b6cdac8fbf1a4230ae8460..faa0f86f99e0f56000861afb73e04f18a7f6c1d8 100644 (file)
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -328,7 +328,7 @@ weakref___init__(PyObject *self, PyObject *args, PyObject *kwargs)
     if (parse_weakref_init_args("__init__", args, kwargs, &tmp, &tmp))
         return 0;
     else
-        return 1;
+        return -1;
 }