[Python-checkins] r86178 - in python/branches/release27-maint: Misc/NEWS Objects/cobject.c

[jesus.cea]

Author: jesus.cea
Date: Thu Nov  4 22:39:52 2010
New Revision: 86178

Log:
CObject use is marked as a Py3k warning, not a deprecation warning

Modified:
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Objects/cobject.c

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Thu Nov  4 22:39:52 2010
@@ -25,6 +25,9 @@
 - 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.
 

Modified: python/branches/release27-maint/Objects/cobject.c
==============================================================================
--- python/branches/release27-maint/Objects/cobject.c	(original)
+++ python/branches/release27-maint/Objects/cobject.c	Thu Nov  4 22:39:52 2010
@@ -11,8 +11,7 @@
 
 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);
 }