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 | dde0c740130c9759eb2295fd03e3a5b0db763396 (patch) | |
| tree | c4fb4a28c6c6a550d0d17f38f56b6ed548c25b24 /Objects/weakrefobject.c | |
| parent | a2b16d1145d4bea32fbf2b046590187b94b72265 (diff) | |
| download | cpython-dde0c740130c9759eb2295fd03e3a5b0db763396.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/weakrefobject.c')
| -rw-r--r-- | Objects/weakrefobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |