[Bf-blender-cvs] [89c2ff31d93] master: PyAPI: update keyword list

Campbell Barton noreply at git.blender.org
Sat Nov 10 23:37:46 CET 2018


Commit: 89c2ff31d93582bd67a359dd0da56061ce7581cb
Author: Campbell Barton
Date:   Sun Nov 11 09:37:26 2018 +1100
Branches: master
https://developer.blender.org/rB89c2ff31d93582bd67a359dd0da56061ce7581cb

PyAPI: update keyword list

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

M	source/blender/editors/space_text/text_format_py.c
M	source/blender/makesrna/intern/rna_define.c
M	source/blender/python/intern/bpy_interface.c

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

diff --git a/source/blender/editors/space_text/text_format_py.c b/source/blender/editors/space_text/text_format_py.c
index 3576d12998f..50bad9c07cf 100644
--- a/source/blender/editors/space_text/text_format_py.c
+++ b/source/blender/editors/space_text/text_format_py.c
@@ -62,6 +62,8 @@ static int txtfmt_py_find_builtinfunc(const char *string)
 	if      (STR_LITERAL_STARTSWITH(string, "and",      len)) i = len;
 	else if (STR_LITERAL_STARTSWITH(string, "as",       len)) i = len;
 	else if (STR_LITERAL_STARTSWITH(string, "assert",   len)) i = len;
+	else if (STR_LITERAL_STARTSWITH(string, "async",    len)) i = len;
+	else if (STR_LITERAL_STARTSWITH(string, "await",    len)) i = len;
 	else if (STR_LITERAL_STARTSWITH(string, "break",    len)) i = len;
 	else if (STR_LITERAL_STARTSWITH(string, "continue", len)) i = len;
 	else if (STR_LITERAL_STARTSWITH(string, "del",      len)) i = len;
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 697e23a414a..d004491a33b 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -425,7 +425,7 @@ static int rna_validate_identifier(const char *identifier, char *error, bool pro
 	 */
 	static const char *kwlist[] = {
 		/* "False", "None", "True", */
-		"and", "as", "assert", "break",
+		"and", "as", "assert", "async", "await", "break",
 		"class", "continue", "def", "del", "elif", "else", "except",
 		"finally", "for", "from", "global", "if", "import", "in",
 		"is", "lambda", "nonlocal", "not", "or", "pass", "raise",
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 0c7f3a7f68d..1ae3106aa76 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -1003,7 +1003,7 @@ bool BPY_string_is_keyword(const char *str)
 	 */
 	const char *kwlist[] = {
 	    "False", "None", "True",
-	    "and", "as", "assert", "break",
+	    "and", "as", "assert", "async", "await", "break",
 	    "class", "continue", "def", "del", "elif", "else", "except",
 	    "finally", "for", "from", "global", "if", "import", "in",
 	    "is", "lambda", "nonlocal", "not", "or", "pass", "raise",



More information about the Bf-blender-cvs mailing list