summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Cea <jcea@jcea.es>2010-11-04 21:39:52 (GMT)
committerJesus Cea <jcea@jcea.es>2010-11-04 21:39:52 (GMT)
commit33c722b795d9ad791ac225c3ecb0178f5aac6df7 (patch)
tree1500cb926417d9c359704e7cf5bb9bd431eedd1c
parentdb31a35aa943cb4267363fdf26e6c3a0a2f0f5ea (diff)
downloadcpython-33c722b795d9ad791ac225c3ecb0178f5aac6df7.zip
cpython-33c722b795d9ad791ac225c3ecb0178f5aac6df7.tar.gz
cpython-33c722b795d9ad791ac225c3ecb0178f5aac6df7.tar.bz2
CObject use is marked as a Py3k warning, not a deprecation warning
-rw-r--r--Misc/NEWS3
-rw-r--r--Objects/cobject.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c39dd86..a667fa3 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 72123f4..355421e 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);
}