[Python-checkins] cpython (merge default -> default): merge heads

[benjamin.peterson]

https://hg.python.org/cpython/rev/17f6dd585ebf
changeset:   94835:17f6dd585ebf
parent:      94834:88cc0edc2713
parent:      94831:b22755f8ab5f
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Mar 02 13:24:21 2015 -0500
summary:
  merge heads

files:
  Objects/object.c |  3 ---
  1 files changed, 0 insertions(+), 3 deletions(-)


diff --git a/Objects/object.c b/Objects/object.c
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1825,9 +1825,6 @@
 
 #endif
 
-/* Hack to force loading of pycapsule.o */
-PyTypeObject *_PyCapsule_hack = &PyCapsule_Type;
-
 
 /* Hack to force loading of abstract.o */
 Py_ssize_t (*_Py_abstract_hack)(PyObject *) = PyObject_Size;

-- 
Repository URL: https://hg.python.org/cpython