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

enum-flag arguments were incorrectly documented.

Browse Source
This commit is contained in:
Campbell Barton
2011-02-16 10:19:14 +00:00
parent ac1e2fc977
commit 430bb75749
4 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
release/scripts/modules/rna_info.py
View File

@@ -200,9 +200,14 @@ class InfoPropertyRNA:
if self.type == "enum":
self.enum_items[:] = rna_prop.items.keys()
self.is_enum_flag = rna_prop.is_enum_flag
else:
self.is_enum_flag = False
if self.array_length:
self.default = tuple(getattr(rna_prop, "default_array", ()))
elif self.type == "enum" and self.is_enum_flag:
self.default = getattr(rna_prop, "default_flag", set())
else:
self.default = getattr(rna_prop, "default", None)
self.default_str = "" # fallback
@@ -214,7 +219,10 @@ class InfoPropertyRNA:
elif self.type == "string":
self.default_str = "\"%s\"" % self.default
elif self.type == "enum":
self.default_str = "'%s'" % self.default
if self.is_enum_flag:
self.default_str = "%r" % self.default # repr or set()
else:
self.default_str = "'%s'" % self.default
elif self.array_length:
self.default_str = ''
# special case for floats
@@ -247,7 +255,10 @@ class InfoPropertyRNA:
if self.type in ("float", "int"):
type_str += " in [%s, %s]" % (range_str(self.min), range_str(self.max))
elif self.type == "enum":
type_str += " in [%s]" % ", ".join(("'%s'" % s) for s in self.enum_items)
if self.is_enum_flag:
type_str += " set in {%s}" % ", ".join(("'%s'" % s) for s in self.enum_items)
else:
type_str += " in [%s]" % ", ".join(("'%s'" % s) for s in self.enum_items)
if not (as_arg or as_ret):
# write default property, ignore function args for this