archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: rename Byte to Bytes in Python string utilities

Browse Source 
These functions operate on byte arrays, not a single byte,
match naming for CPython's PyBytes_AS_STRING.
This commit is contained in:
Campbell Barton
2023-02-15 16:15:59 +11:00
parent 6661342dc5
commit e424931cf7
10 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/python/intern/bpy_rna.c
View File

@@ -1403,7 +1403,7 @@ PyObject *pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
ret = PyBytes_FromStringAndSize(buf, buf_len);
}
else if (ELEM(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME)) {
ret = PyC_UnicodeFromByteAndSize(buf, buf_len);
ret = PyC_UnicodeFromBytesAndSize(buf, buf_len);
}
else {
ret = PyUnicode_FromStringAndSize(buf, buf_len);
@@ -1712,7 +1712,7 @@ static int pyrna_py_to_prop(
PyObject *value_coerce = NULL;
if (ELEM(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME)) {
/* TODO: get size. */
param = PyC_UnicodeAsByte(value, &value_coerce);
param = PyC_UnicodeAsBytes(value, &value_coerce);
}
else {
param = PyUnicode_AsUTF8(value);
@@ -6057,7 +6057,7 @@ static PyObject *pyrna_param_to_py(PointerRNA *ptr, PropertyRNA *prop, void *dat
ret = PyBytes_FromStringAndSize(data_ch, data_ch_len);
}
else if (ELEM(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME)) {
ret = PyC_UnicodeFromByteAndSize(data_ch, data_ch_len);
ret = PyC_UnicodeFromBytesAndSize(data_ch, data_ch_len);
}
else {
ret = PyUnicode_FromStringAndSize(data_ch, data_ch_len);