diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-03-31 01:51:45 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-03-31 01:51:45 (GMT) |
| commit | 2a691a814914a9d2b2188cac25426543a14a8500 (patch) | |
| tree | f185d13c060efb0cb0877df705aba3ed62e96434 /Include/object.h | |
| parent | 7315bad3c4be4c0053e8f98d8410009238b98af8 (diff) | |
| download | cpython-2a691a814914a9d2b2188cac25426543a14a8500.zip cpython-2a691a814914a9d2b2188cac25426543a14a8500.tar.gz cpython-2a691a814914a9d2b2188cac25426543a14a8500.tar.bz2 | |
Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62021 | benjamin.peterson | 2008-03-28 18:11:01 -0500 (Fri, 28 Mar 2008) | 2 lines
NIL => NULL
........
r62029 | amaury.forgeotdarc | 2008-03-28 20:42:31 -0500 (Fri, 28 Mar 2008) | 3 lines
Correctly call the base class tearDown();
otherwise running test_logging twice produce the errors we see on all buildbots
........
r62035 | raymond.hettinger | 2008-03-29 05:42:07 -0500 (Sat, 29 Mar 2008) | 1 line
Be explicit about what efficient means.
........
r62036 | georg.brandl | 2008-03-29 06:46:18 -0500 (Sat, 29 Mar 2008) | 2 lines
Fix capitalization.
........
r62037 | amaury.forgeotdarc | 2008-03-29 07:42:54 -0500 (Sat, 29 Mar 2008) | 5 lines
lib2to3 should install a logging handler only when run as a main program,
not when used as a library.
This may please the buildbots, which fail when test_lib2to3 is run before test_logging.
........
r62043 | benjamin.peterson | 2008-03-29 10:24:25 -0500 (Sat, 29 Mar 2008) | 3 lines
#2503 make singletons compared with "is" not == or !=
Thanks to Wummel for the patch
........
r62044 | gerhard.haering | 2008-03-29 14:11:52 -0500 (Sat, 29 Mar 2008) | 2 lines
Documented the lastrowid attribute.
........
r62052 | benjamin.peterson | 2008-03-30 14:35:10 -0500 (Sun, 30 Mar 2008) | 2 lines
Updated README regarding doc formats
........
r62053 | georg.brandl | 2008-03-30 14:41:39 -0500 (Sun, 30 Mar 2008) | 2 lines
The other download formats will be available for 2.6 too.
........
Diffstat (limited to 'Include/object.h')
| -rw-r--r-- | Include/object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Include/object.h b/Include/object.h index b4b9ce2..0c23e02 100644 --- a/Include/object.h +++ b/Include/object.h @@ -562,7 +562,7 @@ the refcount falls to 0; for objects that don't contain references to other objects or heap memory this can be the standard function free(). Both macros can be used wherever a void expression is allowed. The argument must not be a -NIL pointer. If it may be NIL, use Py_XINCREF/Py_XDECREF instead. +NULL pointer. If it may be NULL, use Py_XINCREF/Py_XDECREF instead. The macro _Py_NewReference(op) initialize reference counts to 1, and in special builds (Py_REF_DEBUG, Py_TRACE_REFS) performs additional bookkeeping appropriate to the special build. |