From 33c722b795d9ad791ac225c3ecb0178f5aac6df7 Mon Sep 17 00:00:00 2001 From: Jesus Cea Date: Thu, 4 Nov 2010 21:39:52 +0000 Subject: [PATCH] CObject use is marked as a Py3k warning, not a deprecation warning --- Misc/NEWS | 3 +++ Objects/cobject.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index c39dd86da07a..a667fa3398f7 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -25,6 +25,9 @@ Core and Builtins - Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding its value as the default 512 when compiling on AIX. +- Issue #9675: CObject use is marked as a Py3k warning, not a deprecation + warning. + - Issue #10068: Global objects which have reference cycles with their module's dict are now cleared again. This causes issue #7140 to appear again. diff --git a/Objects/cobject.c b/Objects/cobject.c index 72123f440a64..355421e63521 100644 --- a/Objects/cobject.c +++ b/Objects/cobject.c @@ -11,8 +11,7 @@ typedef void (*destructor2)(void *, void*); static int cobject_deprecation_warning(void) { - return PyErr_WarnEx(PyExc_PendingDeprecationWarning, - "The CObject type is marked Pending Deprecation in Python 2.7. " + return PyErr_WarnPy3k("CObject type is not supported in 3.x. " "Please use capsule objects instead.", 1); } -- 2.47.3