summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-01-01 14:42:15 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-01-01 14:42:15 (GMT)
commitd9a4d1d5876203c17fa646c8908d15dfda99219a (patch)
tree4b0fef73e08649d0044724dea4c124d63d8da7ce /Objects
parentf5243f07f640f4ae847f2d56e86f5b48ed78728a (diff)
downloadcpython-d9a4d1d5876203c17fa646c8908d15dfda99219a.zip
cpython-d9a4d1d5876203c17fa646c8908d15dfda99219a.tar.gz
cpython-d9a4d1d5876203c17fa646c8908d15dfda99219a.tar.bz2
Merged revisions 59628-59641 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r59631 | christian.heimes | 2007-12-31 20:16:56 +0100 (Mon, 31 Dec 2007) | 1 line Fixed path ........ r59632 | christian.heimes | 2007-12-31 20:20:57 +0100 (Mon, 31 Dec 2007) | 1 line Fixed path to _ssl.c in Windows make file ........ r59633 | christian.heimes | 2007-12-31 20:23:22 +0100 (Mon, 31 Dec 2007) | 1 line Fixed path to _ssl.c in Windows make file, take two ........ r59634 | christian.heimes | 2007-12-31 20:25:22 +0100 (Mon, 31 Dec 2007) | 1 line Fixed path to _ssl.c in Windows make file, take three ... ........ r59635 | neal.norwitz | 2008-01-01 00:48:47 +0100 (Tue, 01 Jan 2008) | 1 line Fix refleak ........ r59637 | guido.van.rossum | 2008-01-01 05:15:29 +0100 (Tue, 01 Jan 2008) | 5 lines Fix an odd error which would only occur close to new year's eve, due to use of datetime.datetime.now() instead of utcnow() for comparison. (I think the test can still fail if it's executed pretty much *at* new year's eve, but that's not worth fixing.) ........ r59638 | christian.heimes | 2008-01-01 14:40:26 +0100 (Tue, 01 Jan 2008) | 1 line MSI uses back slashes as path separators ........ r59639 | christian.heimes | 2008-01-01 14:52:57 +0100 (Tue, 01 Jan 2008) | 1 line Added new wininst files to msi.py and adjusted some paths ........ r59640 | christian.heimes | 2008-01-01 14:58:16 +0100 (Tue, 01 Jan 2008) | 1 line The root of the project is two levels up from PC/VS7.1 ........ r59641 | christian.heimes | 2008-01-01 15:37:32 +0100 (Tue, 01 Jan 2008) | 1 line Added support for new Windows build dirs in PC/ to distutils.sysconfig ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/descrobject.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index ea47181..0926817 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -1204,6 +1204,7 @@ property_copy(PyObject *old, PyObject *get, PyObject *set, PyObject *del,
}
new = PyObject_CallFunction(type, "OOOO", get, set, del, doc);
+ Py_DECREF(type);
if (new == NULL)
return NULL;
pnew = (propertyobject *)new;