diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-10 21:57:34 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-10 21:57:34 +0000 |
| commit | 9aa4299882500ca3206514bced135c0a1083355d (patch) | |
| tree | 2a224e759cc42db9cfb80d0d96e630f0c29e9db3 /Objects | |
| parent | 5e19e4441335a70c9087402e9c487b66c9daca94 (diff) | |
| download | cpython-git-9aa4299882500ca3206514bced135c0a1083355d.tar.gz | |
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
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 4 | ||||
| -rw-r--r-- | Objects/weakrefobject.c | 2 |
2 files changed, 3 insertions, 3 deletions
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; } |