Minor fixes (mostly cosmetic)

Author: lysnikolaou

Objects/interpolationobject.c

@@ -67,10 +67,10 @@ interpolation_new_impl(PyTypeObject *type, PyObject *value,
         return NULL;
     }
 
-    Py_XSETREF(self->value, Py_NewRef(value));
-    Py_XSETREF(self->expression, Py_NewRef(expression));
-    Py_XSETREF(self->conversion, Py_NewRef(conversion));
-    Py_XSETREF(self->format_spec, Py_NewRef(format_spec));
+    self->value = Py_NewRef(value);
+    self->expression = Py_NewRef(expression);
+    self->conversion = Py_NewRef(conversion);
+    self->format_spec = Py_NewRef(format_spec);
     return (PyObject *) self;
 }
 

Objects/templateobject.c

@@ -68,15 +68,23 @@ typedef struct {
 } templateobject;
 
 static templateobject *
-template_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+template_from_strings_interpolations(PyTypeObject *type, PyObject *strings, PyObject *interpolations)
 {
-    if (kwds != NULL) {
-        PyErr_SetString(PyExc_TypeError, "Template.__new__ only accepts *args arguments");
+    templateobject *template = (templateobject *) type->tp_alloc(type, 0);
+    if (template == NULL) {
         return NULL;
     }
 
-    templateobject *self = (templateobject *) type->tp_alloc(type, 0);
-    if (!self) {
+    template->strings = Py_NewRef(strings);
+    template->interpolations = Py_NewRef(interpolations);
+    return template;
+}
+
+static templateobject *
+template_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    if (kwds != NULL) {
+        PyErr_SetString(PyExc_TypeError, "Template.__new__ only accepts *args arguments");
         return NULL;
     }
 
@@ -101,7 +109,6 @@ template_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
             last_was_str = 0;
         }
         else {
-            Py_DECREF(self);
             PyErr_SetString(PyExc_TypeError, "Template.__new__ *args need to be of type 'str' or 'Interpolation'");
             return NULL;
         }
@@ -112,13 +119,11 @@ template_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 
     PyObject *strings = PyTuple_New(stringslen);
     if (!strings) {
-        Py_DECREF(self);
         return NULL;
     }
 
     PyObject *interpolations = PyTuple_New(interpolationslen);
     if (!interpolations) {
-        Py_DECREF(self);
         Py_DECREF(strings);
         return NULL;
     }
@@ -133,7 +138,9 @@ template_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                 PyObject *concat = PyUnicode_Concat(laststring, item);
                 Py_DECREF(laststring);
                 if (!concat) {
-                    goto error;
+                    Py_DECREF(strings);
+                    Py_DECREF(interpolations);
+                    return NULL;
                 }
                 PyTuple_SET_ITEM(strings, stringsidx - 1, concat);
             }
@@ -154,15 +161,10 @@ template_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         PyTuple_SET_ITEM(strings, stringsidx++, &_Py_STR(empty));
     }
 
-    self->strings = strings;
-    self->interpolations = interpolations;
-    return self;
-
-error:
-    Py_DECREF(self);
+    templateobject *template = template_from_strings_interpolations(type, strings, interpolations);
     Py_DECREF(strings);
     Py_DECREF(interpolations);
-    return NULL;
+    return template;
 }
 
 static void
@@ -219,19 +221,6 @@ template_iter(templateobject *self)
     return iter;
 }
 
-static PyObject *
-template_from_strings_interpolations(PyTypeObject *type, PyObject *strings, PyObject *interpolations)
-{
-    PyObject *template = type->tp_alloc(type, 0);
-    if (template == NULL) {
-        return NULL;
-    }
-
-    ((templateobject *) template)->strings = Py_NewRef(strings);
-    ((templateobject *) template)->interpolations = Py_NewRef(interpolations);
-    return template;
-}
-
 static PyObject *
 template_interpolations_copy(PyObject *interpolations) {
     Py_ssize_t interpolationslen = PyTuple_GET_SIZE(interpolations);
@@ -360,12 +349,10 @@ template_concat_templates(templateobject *self, templateobject *other)
         return NULL;
     }
 
-    PyObject *newtemplate = template_from_strings_interpolations(Py_TYPE(self), newstrings, newinterpolations);
-
+    templateobject *newtemplate = template_from_strings_interpolations(Py_TYPE(self), newstrings, newinterpolations);
     Py_DECREF(newstrings);
     Py_DECREF(newinterpolations);
-
-    return newtemplate;
+    return (PyObject *) newtemplate;
 }
 
 static PyObject *
@@ -382,12 +369,10 @@ template_concat_template_str(templateobject *self, PyObject *other)
         return NULL;
     }
 
-    PyObject *newtemplate = template_from_strings_interpolations(Py_TYPE(self), newstrings, newinterpolations);
-
+    templateobject *newtemplate = template_from_strings_interpolations(Py_TYPE(self), newstrings, newinterpolations);
     Py_DECREF(newstrings);
     Py_DECREF(newinterpolations);
-
-    return newtemplate;
+    return (PyObject *) newtemplate;
 }
 
 static PyObject *
@@ -404,12 +389,10 @@ template_concat_str_template(templateobject *self, PyObject *other)
         return NULL;
     }
 
-    PyObject *newtemplate = template_from_strings_interpolations(Py_TYPE(self), newstrings, newinterpolations);
-
+    templateobject *newtemplate = template_from_strings_interpolations(Py_TYPE(self), newstrings, newinterpolations);
     Py_DECREF(newstrings);
     Py_DECREF(newinterpolations);
-
-    return newtemplate;
+    return (PyObject *) newtemplate;
 }
 
 PyObject *