From d54c92b6fb3228f274f08af3bf45265b094a0106 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 26 Jan 2016 17:20:10 +1100 Subject: [PATCH] Cleanup: style --- bam/blend/blendfile.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/bam/blend/blendfile.py b/bam/blend/blendfile.py index db561e8..e5fbb2c 100644 --- a/bam/blend/blendfile.py +++ b/bam/blend/blendfile.py @@ -483,7 +483,9 @@ class BlendFileBlock: if type(result) is not int: 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: # possible (but unlikely) # that this fails and returns None @@ -509,16 +511,16 @@ class BlendFileBlock: for k in self.keys(): try: yield self[k] - except NotImplementedError as err: - msg, dna_name, dna_type = err.args + except NotImplementedError as ex: + msg, dna_name, dna_type = ex.args yield "<%s>" % dna_type.dna_type_id.decode('ascii') def items(self): for k in self.keys(): try: yield (k, self[k]) - except NotImplementedError as err: - msg, dna_name, dna_type = err.args + except NotImplementedError as ex: + msg, dna_name, dna_type = ex.args yield (k, "<%s>" % dna_type.dna_type_id.decode('ascii')) @@ -761,14 +763,16 @@ class DNAStruct: else: return DNA_IO.read_bytes(handle, dna_name.array_size) 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): assert(type(path) == bytes) field = self.field_from_path(header, handle, path) 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_name = field.dna_name @@ -779,7 +783,8 @@ class DNAStruct: else: return DNA_IO.write_bytes(handle, value, dna_name.array_size) 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: