From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 7 May 2015 22:41:47 +0000 (-0400)
Subject: shorten capsule name macro; it doesn't need to be so long
X-Git-Tag: v3.5.0b1~229^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e77f72fb2b247d7024e37a106ed2791bb7298d7;p=thirdparty%2FPython%2Fcpython.git

shorten capsule name macro; it doesn't need to be so long
---

diff --git a/Python/compile.c b/Python/compile.c
index 3d7152cd28cb..77d9f4c6cf11 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -206,7 +206,7 @@ static int compiler_set_qualname(struct compiler *);
 static PyCodeObject *assemble(struct compiler *, int addNone);
 static PyObject *__doc__;
 
-#define COMPILER_CAPSULE_NAME_COMPILER_UNIT "compile.c compiler unit"
+#define CAPSULE_NAME "compile.c compiler unit"
 
 PyObject *
 _Py_Mangle(PyObject *privateobj, PyObject *ident)
@@ -608,7 +608,7 @@ compiler_enter_scope(struct compiler *c, identifier name,
 
     /* Push the old compiler_unit on the stack. */
     if (c->u) {
-        PyObject *capsule = PyCapsule_New(c->u, COMPILER_CAPSULE_NAME_COMPILER_UNIT, NULL);
+        PyObject *capsule = PyCapsule_New(c->u, CAPSULE_NAME, NULL);
         if (!capsule || PyList_Append(c->c_stack, capsule) < 0) {
             Py_XDECREF(capsule);
             compiler_unit_free(u);
@@ -644,7 +644,7 @@ compiler_exit_scope(struct compiler *c)
     n = PyList_GET_SIZE(c->c_stack) - 1;
     if (n >= 0) {
         capsule = PyList_GET_ITEM(c->c_stack, n);
-        c->u = (struct compiler_unit *)PyCapsule_GetPointer(capsule, COMPILER_CAPSULE_NAME_COMPILER_UNIT);
+        c->u = (struct compiler_unit *)PyCapsule_GetPointer(capsule, CAPSULE_NAME);
         assert(c->u);
         /* we are deleting from a list so this really shouldn't fail */
         if (PySequence_DelItem(c->c_stack, n) < 0)
@@ -674,7 +674,7 @@ compiler_set_qualname(struct compiler *c)
         PyObject *mangled, *capsule;
 
         capsule = PyList_GET_ITEM(c->c_stack, stack_size - 1);
-        parent = (struct compiler_unit *)PyCapsule_GetPointer(capsule, COMPILER_CAPSULE_NAME_COMPILER_UNIT);
+        parent = (struct compiler_unit *)PyCapsule_GetPointer(capsule, CAPSULE_NAME);
         assert(parent);
 
         if (u->u_scope_type == COMPILER_SCOPE_FUNCTION || u->u_scope_type == COMPILER_SCOPE_CLASS) {