diff options
| -rw-r--r-- | Doc/using/mac.rst | 13 | ||||
| -rw-r--r-- | Lib/test/test_logging.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_weakref.py | 8 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 4 | ||||
| -rw-r--r-- | Objects/weakrefobject.c | 2 |
5 files changed, 21 insertions, 10 deletions
diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst index 7da291450c..052a489a95 100644 --- 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 75d1366b6c..c99a650ca8 100644 --- 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 108cd7f66c..9821e1ba75 100644 --- 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 66f617e43a..60cd957804 100644 --- 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 83e63fc4f5..faa0f86f99 100644 --- 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; } |