bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Generic check for string being a Py keyword

Browse Source 
Driver code used incomplete list of Py keywords
This commit is contained in:
Campbell Barton 2016-04-01 09:43:11 +11:00
parent bc318fc470
commit de21f07f6c
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/fcurve.c
View File

@ -1649,15 +1649,12 @@ void driver_variable_name_validate(DriverVar *dvar)
* NOTE: These won't confuse Python, but it will be impossible to use the variable
* in an expression without Python misinterpreting what these are for
*/
if (STREQ(dvar->name, "if") || STREQ(dvar->name, "elif") || STREQ(dvar->name, "else") ||
STREQ(dvar->name, "for") || STREQ(dvar->name, "while") || STREQ(dvar->name, "def") ||
STREQ(dvar->name, "True") || STREQ(dvar->name, "False") || STREQ(dvar->name, "import") ||
STREQ(dvar->name, "pass") || STREQ(dvar->name, "with"))
{
#ifdef WITH_PYTHON
if (BPY_string_is_keyword(dvar->name)) {
dvar->flag |= DVAR_FLAG_INVALID_PY_KEYWORD;
}
#endif
/* If any these conditions match, the name is invalid */
if (dvar->flag & DVAR_ALL_INVALID_FLAGS)
dvar->flag |= DVAR_FLAG_INVALID_NAME;

2
source/blender/python/BPY_extern.h
View File

@ -95,6 +95,8 @@ void BPY_context_update(struct bContext *C);
void BPY_id_release(struct ID *id);
bool BPY_string_is_keyword(const char *str);
/* I18n for addons */
#ifdef WITH_INTERNATIONAL
const char *BPY_app_translations_py_pgettext(const char *msgctxt, const char *msgid);

26
source/blender/python/intern/bpy_interface.c
View File

@ -899,6 +899,32 @@ static void bpy_module_free(void *UNUSED(mod))
#endif
/**
* Avoids duplicating keyword list.
*/
bool BPY_string_is_keyword(const char *str)
{
/* list is from...
* ", ".join(['"%s"' % kw for kw in __import__("keyword").kwlist])
*/
const char *kwlist[] = {
"False", "None", "True",
"and", "as", "assert", "break",
"class", "continue", "def", "del", "elif", "else", "except",
"finally", "for", "from", "global", "if", "import", "in",
"is", "lambda", "nonlocal", "not", "or", "pass", "raise",
"return", "try", "while", "with", "yield", NULL,
};
for (int i = 0; kwlist[i]; i++) {
if (STREQ(str, kwlist[i])) {
return true;
}
}
return false;
}
/* EVIL, define text.c functions here... */
/* BKE_text.h */