archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2016-01-26 17:20:10 +11:00
parent 4360fa5475
commit d54c92b6fb
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bam/blend/blendfile.py
View File

@@ -483,7 +483,9 @@ class BlendFileBlock:
if type(result) is not int: if type(result) is not int:
return result return result
assert(self.file.structs[sdna_index_refine].field_from_path(self.file.header, self.file.handle, path).dna_name.is_pointer) assert(self.file.structs[sdna_index_refine].field_from_path(
self.file.header, self.file.handle, path).dna_name.is_pointer)
if result != 0: if result != 0:
# possible (but unlikely) # possible (but unlikely)
# that this fails and returns None # that this fails and returns None
@@ -509,16 +511,16 @@ class BlendFileBlock:
for k in self.keys(): for k in self.keys():
try: try:
yield self[k] yield self[k]
except NotImplementedError as err: except NotImplementedError as ex:
msg, dna_name, dna_type = err.args msg, dna_name, dna_type = ex.args
yield "<%s>" % dna_type.dna_type_id.decode('ascii') yield "<%s>" % dna_type.dna_type_id.decode('ascii')
def items(self): def items(self):
for k in self.keys(): for k in self.keys():
try: try:
yield (k, self[k]) yield (k, self[k])
except NotImplementedError as err: except NotImplementedError as ex:
msg, dna_name, dna_type = err.args msg, dna_name, dna_type = ex.args
yield (k, "<%s>" % dna_type.dna_type_id.decode('ascii')) yield (k, "<%s>" % dna_type.dna_type_id.decode('ascii'))
@@ -761,14 +763,16 @@ class DNAStruct:
else: else:
return DNA_IO.read_bytes(handle, dna_name.array_size) return DNA_IO.read_bytes(handle, dna_name.array_size)
else: else:
raise NotImplementedError("%r exists but isn't pointer, can't resolve field %r" % (path, dna_name.name_only), dna_name, dna_type) raise NotImplementedError("%r exists but isn't pointer, can't resolve field %r" %
(path, dna_name.name_only))
def field_set(self, header, handle, path, value): def field_set(self, header, handle, path, value):
assert(type(path) == bytes) assert(type(path) == bytes)
field = self.field_from_path(header, handle, path) field = self.field_from_path(header, handle, path)
if field is None: if field is None:
raise KeyError("%r not found in %r" % (path, [f.dna_name.name_only for f in self.fields])) raise KeyError("%r not found in %r" %
(path, [f.dna_name.name_only for f in self.fields]))
dna_type = field.dna_type dna_type = field.dna_type
dna_name = field.dna_name dna_name = field.dna_name
@@ -779,7 +783,8 @@ class DNAStruct:
else: else:
return DNA_IO.write_bytes(handle, value, dna_name.array_size) return DNA_IO.write_bytes(handle, value, dna_name.array_size)
else: else:
raise NotImplementedError("Setting %r is not yet supported" % dna_type[0], dna_name, dna_type) raise NotImplementedError("Setting %r is not yet supported" %
dna_type[0], dna_name, dna_type)
class DNA_IO: class DNA_IO: