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

Comments: some minor clarifications

Browse Source 
Noticed accidental swap of `Ellipsis/...`, and note that `yield from` can be put back later on.

Reviewers: dfelinto

Reviewed By: dfelinto

Differential Revision: https://developer.blender.org/D2390
This commit is contained in:
Dalai Felinto
2016-12-02 10:21:51 +01:00
parent bf61ffbc36
commit 76e3428d87
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
blendfile/__init__.py
View File

@@ -101,7 +101,7 @@ class BlendFile:
"block_header_struct", "block_header_struct",
# BlendFileBlock # BlendFileBlock
"blocks", "blocks",
# [DNAStruct, Ellipsis] # [DNAStruct, ...]
"structs", "structs",
# dict {b'StructName': sdna_index} # dict {b'StructName': sdna_index}
# (where the index is an index into 'structs') # (where the index is an index into 'structs')
@@ -448,12 +448,14 @@ class BlendFileBlock:
else: else:
struct = self.file.structs[struct_index] struct = self.file.structs[struct_index]
for f in struct.fields: for f in struct.fields:
# Use "yield from" when Python2 is dropped
for y in self.get_recursive_iter( for y in self.get_recursive_iter(
f.dna_name.name_only, path_full, default, None, use_nil, use_str, 0): f.dna_name.name_only, path_full, default, None, use_nil, use_str, 0):
yield y yield y
def items_recursive_iter(self): def items_recursive_iter(self):
for k in self.keys(): for k in self.keys():
# Use "yield from" when Python2 is dropped
for y in self.get_recursive_iter(k, use_str=False): for y in self.get_recursive_iter(k, use_str=False):
yield y yield y