[Bf-blender-cvs] [d022794cad9] blender2.8: Cleanup: rename checks for Python struct strings

Campbell Barton noreply at git.blender.org
Sun Oct 7 23:44:56 CEST 2018


Commit: d022794cad977229386934e7d25365270671874f
Author: Campbell Barton
Date:   Mon Oct 8 08:37:32 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBd022794cad977229386934e7d25365270671874f

Cleanup: rename checks for Python struct strings

Using 'format' prefix made this read as if t was for string formatting.

Use 'PyC_StructFmt' prefix instead since these values are compatible
with formatting from Python's 'struct' module.

===================================================================

M	source/blender/python/generic/bgl.c
M	source/blender/python/generic/idprop_py_api.c
M	source/blender/python/generic/py_capi_utils.c
M	source/blender/python/generic/py_capi_utils.h
M	source/blender/python/gpu/gpu_py_element.c

===================================================================

diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index 33ad824bace..6e1c28e1310 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -480,15 +480,15 @@ int BGL_typeSize(int type)
 
 static int gl_buffer_type_from_py_buffer(Py_buffer *pybuffer)
 {
-	const char format = PyC_Formatchar_get(pybuffer->format);
+	const char format = PyC_StructFmt_type_from_str(pybuffer->format);
 	Py_ssize_t itemsize = pybuffer->itemsize;
 
-	if (PyC_Formatchar_is_floating_type(format)) {
+	if (PyC_StructFmt_type_is_float_any(format)) {
 		if (itemsize == 4) return GL_FLOAT;
 		if (itemsize == 8) return GL_DOUBLE;
 	}
-	if (PyC_Formatchar_is_byte_type(format) ||
-	    PyC_Formatchar_is_integer_type(format))
+	if (PyC_StructFmt_type_is_byte(format) ||
+	    PyC_StructFmt_type_is_int_any(format))
 	{
 		if (itemsize == 1) return GL_BYTE;
 		if (itemsize == 2) return GL_SHORT;
diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c
index 3eef3a1aa28..03ec8e54d07 100644
--- a/source/blender/python/generic/idprop_py_api.c
+++ b/source/blender/python/generic/idprop_py_api.c
@@ -424,13 +424,13 @@ static IDProperty *idp_from_PyBytes(const char *name, PyObject *ob)
 
 static int idp_array_type_from_formatstr_and_size(const char *typestr, Py_ssize_t itemsize)
 {
-	char format = PyC_Formatchar_get(typestr);
+	char format = PyC_StructFmt_type_from_str(typestr);
 
-	if (PyC_Formatchar_is_floating_type(format)) {
+	if (PyC_StructFmt_type_is_float_any(format)) {
 		if (itemsize == 4) return IDP_FLOAT;
 		if (itemsize == 8) return IDP_DOUBLE;
 	}
-	if (PyC_Formatchar_is_integer_type(format)) {
+	if (PyC_StructFmt_type_is_int_any(format)) {
 		if (itemsize == 4) return IDP_INT;
 	}
 
@@ -540,9 +540,9 @@ static IDProperty *idp_from_PySequence(const char *name, PyObject *ob)
 
 	if (PyObject_CheckBuffer(ob)) {
 		PyObject_GetBuffer(ob, &buffer, PyBUF_SIMPLE | PyBUF_FORMAT);
-		char format = PyC_Formatchar_get(buffer.format);
-		if (PyC_Formatchar_is_floating_type(format) ||
-		    (PyC_Formatchar_is_integer_type(format) && buffer.itemsize == 4))
+		char format = PyC_StructFmt_type_from_str(buffer.format);
+		if (PyC_StructFmt_type_is_float_any(format) ||
+		    (PyC_StructFmt_type_is_int_any(format) && buffer.itemsize == 4))
 		{
 			use_buffer = true;
 		}
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 047ff9807a6..991a035f683 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -1333,7 +1333,7 @@ uint32_t PyC_Long_AsU32(PyObject *value)
  *
  * \{ */
 
-char PyC_Formatchar_get(const char *typestr)
+char PyC_StructFmt_type_from_str(const char *typestr)
 {
 	switch (typestr[0]) {
 		case '!':
@@ -1347,7 +1347,7 @@ char PyC_Formatchar_get(const char *typestr)
 	}
 }
 
-bool PyC_Formatchar_is_floating_type(char format)
+bool PyC_StructFmt_type_is_float_any(char format)
 {
 	switch (format) {
 		case 'f':
@@ -1359,7 +1359,7 @@ bool PyC_Formatchar_is_floating_type(char format)
 	}
 }
 
-bool PyC_Formatchar_is_integer_type(char format)
+bool PyC_StructFmt_type_is_int_any(char format)
 {
 	switch (format) {
 		case 'i':
@@ -1381,7 +1381,7 @@ bool PyC_Formatchar_is_integer_type(char format)
 	}
 }
 
-bool PyC_Formatchar_is_byte_type(char format)
+bool PyC_StructFmt_type_is_byte(char format)
 {
 	switch (format) {
 		case 'c':
@@ -1393,7 +1393,7 @@ bool PyC_Formatchar_is_byte_type(char format)
 	}
 }
 
-bool PyC_Formatchar_is_boolean_type(char format)
+bool PyC_StructFmt_type_is_bool(char format)
 {
 	switch (format) {
 		case '?':
diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.h
index 7631dc3f3a6..778bd38bada 100644
--- a/source/blender/python/generic/py_capi_utils.h
+++ b/source/blender/python/generic/py_capi_utils.h
@@ -132,10 +132,10 @@ Py_LOCAL_INLINE(int64_t)  PyC_Long_AsI64(PyObject *value) { return (int64_t)PyLo
 Py_LOCAL_INLINE(uint64_t) PyC_Long_AsU64(PyObject *value) { return (uint64_t)PyLong_AsUnsignedLongLong(value); }
 
 /* utils for format string in `struct` module style syntax */
-char PyC_Formatchar_get(const char *typestr);
-bool PyC_Formatchar_is_floating_type(char format);
-bool PyC_Formatchar_is_integer_type(char format);
-bool PyC_Formatchar_is_byte_type(char format);
-bool PyC_Formatchar_is_boolean_type(char format);
+char PyC_StructFmt_type_from_str(const char *typestr);
+bool PyC_StructFmt_type_is_float_any(char format);
+bool PyC_StructFmt_type_is_int_any(char format);
+bool PyC_StructFmt_type_is_byte(char format);
+bool PyC_StructFmt_type_is_bool(char format);
 
 #endif  /* __PY_CAPI_UTILS_H__ */
diff --git a/source/blender/python/gpu/gpu_py_element.c b/source/blender/python/gpu/gpu_py_element.c
index 72b593ab432..998253d7a36 100644
--- a/source/blender/python/gpu/gpu_py_element.c
+++ b/source/blender/python/gpu/gpu_py_element.c
@@ -92,7 +92,7 @@ static PyObject *bpygpu_IndexBuf_new(PyTypeObject *UNUSED(type), PyObject *args,
 		}
 
 		if (pybuffer.itemsize != 4 ||
-		    PyC_Formatchar_is_floating_type(PyC_Formatchar_get(pybuffer.format)))
+		    PyC_StructFmt_type_is_float_any(PyC_StructFmt_type_from_str(pybuffer.format)))
 		{
 			PyErr_Format(PyExc_ValueError,
 			             "Each index must be an 4-bytes integer value");



More information about the Bf-blender-cvs mailing list