Address feedback; fix template_values_get and conversion

Author: lysnikolaou

Lib/test/test_string/test_templatelib.py

@@ -67,6 +67,19 @@ def test_creation_interleaving(self):
         )
         self.assertEqual(fstring(t), 'MariaPython')
 
+    def test_template_values(self):
+        t = t'Hello, world'
+        self.assertEqual(t.values, ())
+
+        name = "Lys"
+        t = t'Hello, {name}'
+        self.assertEqual(t.values, ("Lys",))
+
+        country = "GR"
+        age = 0
+        t = t'Hello, {name}, {age} from {country}'
+        self.assertEqual(t.values, ("Lys", 0, "GR"))
+
     def test_pickle_template(self):
         user = 'test'
         for template in (

Objects/interpolationobject.c

@@ -195,6 +195,7 @@ _PyInterpolation_Build(PyObject *value, PyObject *str, int conversion, PyObject
     interpolation->value = Py_NewRef(value);
     interpolation->expression = Py_NewRef(str);
     interpolation->format_spec = Py_NewRef(format_spec);
+    interpolation->conversion = NULL;
 
     if (conversion == 0) {
         interpolation->conversion = Py_None;

Objects/templateobject.c

@@ -388,29 +388,18 @@ static PyObject *
 template_values_get(PyObject *op, void *Py_UNUSED(data))
 {
     templateobject *self = templateobject_CAST(op);
+
+    Py_ssize_t len = PyTuple_GET_SIZE(self->interpolations);
     PyObject *values = PyTuple_New(PyTuple_GET_SIZE(self->interpolations));
     if (values == NULL) {
         return NULL;
     }
 
-    PyObject *interpolationsiter = PyObject_GetIter(self->interpolations);
-    if (interpolationsiter == NULL) {
-        Py_DECREF(values);
-        return NULL;
-    }
-
-    PyObject *item;
-    Py_ssize_t index = 0;
-    while ((item = PyIter_Next(interpolationsiter))) {
-        PyTuple_SET_ITEM(values, index++, _PyInterpolation_GetValueRef(item));
-        Py_DECREF(item);
+    for (Py_ssize_t i = 0; i < len; i++) {
+        PyObject *item = PyTuple_GET_ITEM(self->interpolations, i);
+        PyTuple_SET_ITEM(values, i, _PyInterpolation_GetValueRef(item));
     }
 
-    Py_DECREF(interpolationsiter);
-    if (PyErr_Occurred()) {
-        Py_DECREF(values);
-        return NULL;
-    }
     return values;
 }