Merge lp:~cjwatson/storm/cextensions-rename-dunder into lp:storm

[Colin Watson]

Rename double-underscore identifiers in C extensions.

Unlike Python, identifiers that begin with two underscores are reserved in C. This happens not to have caused a practical problem as yet, but it could. These names aren't exposed to Python, so there's no problem just renaming them to begin with a single underscore instead.

[Simon Poirier (simpoir)]

+1 good change

review: Approve

=== modified file 'storm/cextensions.c'
--- storm/cextensions.c	2019-06-03 08:45:24 +0000
+++ storm/cextensions.c	2019-06-06 11:07:28 +0000
@@ -55,7 +55,7 @@
 
 typedef struct {
     PyObject_HEAD
-    PyObject *__weakreflist;
+    PyObject *_weakreflist;
     PyObject *_owner_ref;
     PyObject *_hooks;
 } EventSystemObject;
@@ -75,7 +75,7 @@
 
 typedef struct {
     PyObject_HEAD
-    PyObject *__weakreflist;
+    PyObject *_weakreflist;
     PyObject *_local_dispatch_table;
     PyObject *_local_precedence;
     PyObject *_local_reserved_words;
@@ -88,9 +88,9 @@
 
 typedef struct {
     PyDictObject super;
-    PyObject *__weakreflist;
-    PyObject *__obj_ref;
-    PyObject *__obj_ref_callback;
+    PyObject *_weakreflist;
+    PyObject *_obj_ref;
+    PyObject *_obj_ref_callback;
     PyObject *cls_info;
     PyObject *event;
     PyObject *variables;
@@ -211,7 +211,7 @@
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O", kwlist, &owner))
         return -1;
 
-    self->__weakreflist = NULL;
+    self->_weakreflist = NULL;
 
     /* self._owner_ref = weakref.ref(owner) */
     self->_owner_ref = PyWeakref_NewRef(owner, NULL);
@@ -237,7 +237,7 @@
 static int
 EventSystem_clear(EventSystemObject *self)
 {
-    if (self->__weakreflist)
+    if (self->_weakreflist)
         PyObject_ClearWeakRefs((PyObject *)self);
     Py_CLEAR(self->_owner_ref);
     Py_CLEAR(self->_hooks);
@@ -495,7 +495,7 @@
     (traverseproc)EventSystem_traverse,  /*tp_traverse*/
     (inquiry)EventSystem_clear,          /*tp_clear*/
     0,                      /*tp_richcompare*/
-    offsetof(EventSystemObject, __weakreflist), /*tp_weaklistoffset*/
+    offsetof(EventSystemObject, _weakreflist), /*tp_weaklistoffset*/
     0,                      /*tp_iter*/
     0,                      /*tp_iternext*/
     EventSystem_methods,        /*tp_methods*/
@@ -1206,7 +1206,7 @@
 static int
 Compile_clear(CompileObject *self)
 {
-    if (self->__weakreflist)
+    if (self->_weakreflist)
         PyObject_ClearWeakRefs((PyObject *)self);
     Py_CLEAR(self->_local_dispatch_table);
     Py_CLEAR(self->_local_precedence);
@@ -1762,7 +1762,7 @@
     (traverseproc)Compile_traverse,  /*tp_traverse*/
     (inquiry)Compile_clear,          /*tp_clear*/
     0,                      /*tp_richcompare*/
-    offsetof(CompileObject, __weakreflist), /*tp_weaklistoffset*/
+    offsetof(CompileObject, _weakreflist), /*tp_weaklistoffset*/
     0,                      /*tp_iter*/
     0,                      /*tp_iternext*/
     Compile_methods,        /*tp_methods*/
@@ -1818,12 +1818,12 @@
                                                               NULL));
 
     /* self.set_obj(obj) */
-    CATCH(NULL, self->__obj_ref_callback =
+    CATCH(NULL, self->_obj_ref_callback =
                     PyCFunction_NewEx(&ObjectInfo_deleted_callback,
                                       (PyObject *)self, NULL));
 
     CATCH(NULL,
-          self->__obj_ref = PyWeakref_NewRef(obj, self->__obj_ref_callback));
+          self->_obj_ref = PyWeakref_NewRef(obj, self->_obj_ref_callback));
 
     /* self.event = event = EventSystem(self) */
     CATCH(NULL,
@@ -1897,7 +1897,7 @@
 static PyObject *
 ObjectInfo_get_obj(ObjectInfoObject *self, PyObject *args)
 {
-    PyObject *obj = PyWeakref_GET_OBJECT(self->__obj_ref);
+    PyObject *obj = PyWeakref_GET_OBJECT(self->_obj_ref);
     Py_INCREF(obj);
     return obj;
 }
@@ -1911,9 +1911,9 @@
     if (!PyArg_ParseTuple(args, "O", &obj))
         return NULL;
 
-    Py_DECREF(self->__obj_ref);
-    self->__obj_ref = PyWeakref_NewRef(obj, self->__obj_ref_callback);
-    if (!self->__obj_ref)
+    Py_DECREF(self->_obj_ref);
+    self->_obj_ref = PyWeakref_NewRef(obj, self->_obj_ref_callback);
+    if (!self->_obj_ref)
         return NULL;
 
     Py_RETURN_NONE;
@@ -1947,8 +1947,8 @@
 static int
 ObjectInfo_traverse(ObjectInfoObject *self, visitproc visit, void *arg)
 {
-    Py_VISIT(self->__obj_ref);
-    Py_VISIT(self->__obj_ref_callback);
+    Py_VISIT(self->_obj_ref);
+    Py_VISIT(self->_obj_ref_callback);
     Py_VISIT(self->cls_info);
     Py_VISIT(self->event);
     Py_VISIT(self->variables);
@@ -1959,8 +1959,8 @@
 static int
 ObjectInfo_clear(ObjectInfoObject *self)
 {
-    Py_CLEAR(self->__obj_ref);
-    Py_CLEAR(self->__obj_ref_callback);
+    Py_CLEAR(self->_obj_ref);
+    Py_CLEAR(self->_obj_ref_callback);
     Py_CLEAR(self->cls_info);
     Py_CLEAR(self->event);
     Py_CLEAR(self->variables);
@@ -1991,10 +1991,10 @@
 static void
 ObjectInfo_dealloc(ObjectInfoObject *self)
 {
-    if (self->__weakreflist)
+    if (self->_weakreflist)
         PyObject_ClearWeakRefs((PyObject *)self);
-    Py_CLEAR(self->__obj_ref);
-    Py_CLEAR(self->__obj_ref_callback);
+    Py_CLEAR(self->_obj_ref);
+    Py_CLEAR(self->_obj_ref_callback);
     Py_CLEAR(self->cls_info);
     Py_CLEAR(self->event);
     Py_CLEAR(self->variables);
@@ -2053,7 +2053,7 @@
     (traverseproc)ObjectInfo_traverse, /*tp_traverse*/
     (inquiry)ObjectInfo_clear, /*tp_clear*/
     ObjectInfo_richcompare, /*tp_richcompare*/
-    offsetof(ObjectInfoObject, __weakreflist), /*tp_weaklistoffset*/
+    offsetof(ObjectInfoObject, _weakreflist), /*tp_weaklistoffset*/
     0,                      /*tp_iter*/
     0,                      /*tp_iternext*/
     ObjectInfo_methods,     /*tp_methods*/