From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Sun, 1 Dec 2013 01:58:53 +0000 (-0800)
Subject: Issue #6477: Merge with 3.3.
X-Git-Tag: v3.4.0b2~418
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ccf8e969c5e870a6c416ac7970c9f94c0da86fd;p=python

Issue #6477: Merge with 3.3.
---

2ccf8e969c5e870a6c416ac7970c9f94c0da86fd
diff --cc Objects/object.c
index 8ccc91cd4b,e079d5104b..62bdb49d13
--- a/Objects/object.c
+++ b/Objects/object.c
@@@ -1485,16 -1524,7 +1485,16 @@@ notimplemented_new(PyTypeObject *type, 
      Py_RETURN_NOTIMPLEMENTED;
  }
  
 +static void
 +notimplemented_dealloc(PyObject* ignore)
 +{
 +    /* This should never get called, but we also don't want to SEGV if
 +     * we accidentally decref NotImplemented out of existence.
 +     */
 +    Py_FatalError("deallocating NotImplemented");
 +}
 +
- PyTypeObject PyNotImplemented_Type = {
+ PyTypeObject _PyNotImplemented_Type = {
      PyVarObject_HEAD_INIT(&PyType_Type, 0)
      "NotImplementedType",
      0,