From a56e985cdc1e65acf803b1799916d5b87ea25d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 26 Feb 2018 18:14:23 +0100 Subject: [PATCH] Unify behaviour of block[path] and block.get(path) --- blender_asset_tracer/blendfile/__init__.py | 4 ++-- tests/test_blendfile_loading.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/blender_asset_tracer/blendfile/__init__.py b/blender_asset_tracer/blendfile/__init__.py index 950cd7c..b6700f3 100644 --- a/blender_asset_tracer/blendfile/__init__.py +++ b/blender_asset_tracer/blendfile/__init__.py @@ -384,7 +384,7 @@ class BlendFileBlock: path: dna.FieldPath, default=..., null_terminated=True, - as_str=True, + as_str=False, base_index=0, ) -> typing.Any: """Read a property and return the value. @@ -507,7 +507,7 @@ class BlendFileBlock: raise exceptions.SegmentationFault('address does not exist', path, result) def __getitem__(self, path: dna.FieldPath): - return self.get(path, as_str=False) + return self.get(path) def __setitem__(self, item, value): self.set(item, value) diff --git a/tests/test_blendfile_loading.py b/tests/test_blendfile_loading.py index 1e132f7..f614472 100644 --- a/tests/test_blendfile_loading.py +++ b/tests/test_blendfile_loading.py @@ -32,7 +32,7 @@ class BlendFileBlockTest(AbstractBlendFileTest): self.assertEqual([2.0, 3.0, 5.0], loc) # Try getting a subproperty. - name = ob.get((b'id', b'name')) + name = ob.get((b'id', b'name'), as_str=True) self.assertEqual('OBümlaut', name) loc_z = ob.get((b'loc', 2)) @@ -41,7 +41,7 @@ class BlendFileBlockTest(AbstractBlendFileTest): # Try following a pointer. mesh_ptr = ob.get(b'data') mesh = self.bf.block_from_addr[mesh_ptr] - mname = mesh.get((b'id', b'name')) + mname = mesh.get((b'id', b'name'), as_str=True) self.assertEqual('MECube³', mname) def test_get_recursive_iter(self): @@ -222,7 +222,7 @@ class LoadCompressedTest(AbstractBlendFileTest): self.assertTrue(self.bf.is_compressed) ob = self.bf.code_index[b'OB'][0] - name = ob.get((b'id', b'name')) + name = ob.get((b'id', b'name'), as_str=True) self.assertEqual('OBümlaut', name) def test_as_context(self):