diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-04-01 01:43:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-01 01:49:16 +0300 |
commit | de21f07f6c192e8076ae091e8c73587411bda4fd (patch) | |
tree | f1aacbd3256fc548aeaa3f4dd7826a4953b759e2 /source | |
parent | bc318fc47099df92323276f849fe5a6ce9007546 (diff) |
Generic check for string being a Py keyword
Driver code used incomplete list of Py keywords
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 11 | ||||
-rw-r--r-- | source/blender/python/BPY_extern.h | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_interface.c | 26 |
3 files changed, 32 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 845229e49e3..29da218f973 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -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; diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h index d3be59921c0..4006816e788 100644 --- a/source/blender/python/BPY_extern.h +++ b/source/blender/python/BPY_extern.h @@ -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); diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 0c3048dd9d6..b559623f619 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -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 */ |