diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-14 09:18:59 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-14 09:18:59 +0300 |
commit | 39c341bf4ab9582edc26227447634cae2004baa6 (patch) | |
tree | dce6d8f00adbca2b3b6c7be99119507023beab92 /tests | |
parent | 260b75a952f40961d3e06c9a7f48ec9b696bf169 (diff) |
Cleanup: remove redundant braces from assert & raise
autopep8 v1.7 added a space after assert & raise,
remove the braces as they aren't needed.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/python/bl_blendfile_io.py | 4 | ||||
-rw-r--r-- | tests/python/bl_blendfile_liblink.py | 264 | ||||
-rw-r--r-- | tests/python/bl_blendfile_library_overrides.py | 140 | ||||
-rw-r--r-- | tests/python/bl_keymap_validate.py | 2 | ||||
-rw-r--r-- | tests/python/bl_load_addons.py | 6 | ||||
-rw-r--r-- | tests/python/bl_load_py_modules.py | 2 | ||||
-rw-r--r-- | tests/python/bl_mesh_modifiers.py | 6 | ||||
-rw-r--r-- | tests/python/bl_pyapi_idprop.py | 2 | ||||
-rw-r--r-- | tests/python/bl_rna_manual_reference.py | 8 | ||||
-rw-r--r-- | tests/python/bl_run_operators_event_simulate.py | 2 |
10 files changed, 218 insertions, 218 deletions
diff --git a/tests/python/bl_blendfile_io.py b/tests/python/bl_blendfile_io.py index f79ee2a240b..fa63b789751 100644 --- a/tests/python/bl_blendfile_io.py +++ b/tests/python/bl_blendfile_io.py @@ -33,7 +33,7 @@ class TestBlendFileSaveLoadBasic(TestHelper): read_data = self.blender_data_to_tuple(bpy.data, "read_data 1") # We have orphaned data, which should be removed by file reading, so there should not be equality here. - assert(orig_data != read_data) + assert orig_data != read_data bpy.data.orphans_purge() @@ -44,7 +44,7 @@ class TestBlendFileSaveLoadBasic(TestHelper): read_data = self.blender_data_to_tuple(bpy.data, "read_data 2") - assert(orig_data == read_data) + assert orig_data == read_data TESTS = ( diff --git a/tests/python/bl_blendfile_liblink.py b/tests/python/bl_blendfile_liblink.py index 120afba4911..a4ca845da4e 100644 --- a/tests/python/bl_blendfile_liblink.py +++ b/tests/python/bl_blendfile_liblink.py @@ -93,9 +93,9 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): link_dir = os.path.join(output_lib_path, "Mesh") bpy.ops.wm.link(directory=link_dir, filename="LibMesh", instance_object_data=False) - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.objects) == 0) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.objects) == 0 + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here orig_data = self.blender_data_to_tuple(bpy.data, "orig_data") @@ -106,8 +106,8 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): read_data = self.blender_data_to_tuple(bpy.data, "read_data") # Since there is no usage of linked mesh, it is lost during save/reload. - assert(len(bpy.data.meshes) == 0) - assert(orig_data != read_data) + assert len(bpy.data.meshes) == 0 + assert orig_data != read_data # Simple link of a single ObData with obdata instantiation. self.reset_blender() @@ -115,9 +115,9 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): link_dir = os.path.join(output_lib_path, "Mesh") bpy.ops.wm.link(directory=link_dir, filename="LibMesh", instance_object_data=True) - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.objects) == 1) # Instance created for the mesh ObData. - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.objects) == 1 # Instance created for the mesh ObData. + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here orig_data = self.blender_data_to_tuple(bpy.data, "orig_data") @@ -126,7 +126,7 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): read_data = self.blender_data_to_tuple(bpy.data, "read_data") - assert(orig_data == read_data) + assert orig_data == read_data # Simple link of a single Object. self.reset_blender() @@ -134,9 +134,9 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): link_dir = os.path.join(output_lib_path, "Object") bpy.ops.wm.link(directory=link_dir, filename="LibMesh") - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.objects) == 1) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.objects) == 1 + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here orig_data = self.blender_data_to_tuple(bpy.data, "orig_data") @@ -145,7 +145,7 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): read_data = self.blender_data_to_tuple(bpy.data, "read_data") - assert(orig_data == read_data) + assert orig_data == read_data # Simple link of a single Collection, with Empty-instantiation. self.reset_blender() @@ -153,9 +153,9 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): link_dir = os.path.join(output_lib_path, "Collection") bpy.ops.wm.link(directory=link_dir, filename="LibMesh", instance_collections=True) - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.objects) == 2) # linked object and local empty instancing the collection - assert(len(bpy.data.collections) == 1) # Scene's master collection is not listed here + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.objects) == 2 # linked object and local empty instancing the collection + assert len(bpy.data.collections) == 1 # Scene's master collection is not listed here orig_data = self.blender_data_to_tuple(bpy.data, "orig_data") @@ -164,7 +164,7 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): read_data = self.blender_data_to_tuple(bpy.data, "read_data") - assert(orig_data == read_data) + assert orig_data == read_data # Simple link of a single Collection, with ViewLayer-instantiation. self.reset_blender() @@ -172,11 +172,11 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): link_dir = os.path.join(output_lib_path, "Collection") bpy.ops.wm.link(directory=link_dir, filename="LibMesh", instance_collections=False) - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.objects) == 1) - assert(len(bpy.data.collections) == 1) # Scene's master collection is not listed here + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.objects) == 1 + assert len(bpy.data.collections) == 1 # Scene's master collection is not listed here # Linked collection should have been added to the scene's master collection children. - assert(bpy.data.collections[0] in set(bpy.data.scenes[0].collection.children)) + assert bpy.data.collections[0] in set(bpy.data.scenes[0].collection.children) orig_data = self.blender_data_to_tuple(bpy.data, "orig_data") @@ -185,7 +185,7 @@ class TestBlendLibLinkSaveLoadBasic(TestBlendLibLinkHelper): read_data = self.blender_data_to_tuple(bpy.data, "read_data") - assert(orig_data == read_data) + assert orig_data == read_data class TestBlendLibAppendBasic(TestBlendLibLinkHelper): @@ -211,15 +211,15 @@ class TestBlendLibAppendBasic(TestBlendLibLinkHelper): bpy.data.materials[0].use_fake_user, ) - assert(len(bpy.data.materials) == 1) - assert(bpy.data.materials[0].library is not None) - assert(bpy.data.materials[0].users == 2) # Fake user is not cleared when linking. - assert(len(bpy.data.meshes) == 1) - assert(bpy.data.meshes[0].library is None) - assert(bpy.data.meshes[0].use_fake_user is False) - assert(bpy.data.meshes[0].users == 0) - assert(len(bpy.data.objects) == 0) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.materials) == 1 + assert bpy.data.materials[0].library is not None + assert bpy.data.materials[0].users == 2 # Fake user is not cleared when linking. + assert len(bpy.data.meshes) == 1 + assert bpy.data.meshes[0].library is None + assert bpy.data.meshes[0].use_fake_user is False + assert bpy.data.meshes[0].users == 0 + assert len(bpy.data.objects) == 0 + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here # Simple append of a single ObData with obdata instantiation. self.reset_blender() @@ -228,16 +228,16 @@ class TestBlendLibAppendBasic(TestBlendLibLinkHelper): bpy.ops.wm.append(directory=link_dir, filename="LibMesh", instance_object_data=True, set_fake=False, use_recursive=False, do_reuse_local_id=False) - assert(len(bpy.data.materials) == 1) - assert(bpy.data.materials[0].library is not None) - assert(bpy.data.materials[0].users == 2) # Fake user is not cleared when linking. - assert(len(bpy.data.meshes) == 1) - assert(bpy.data.meshes[0].library is None) - assert(bpy.data.meshes[0].use_fake_user is False) - assert(bpy.data.meshes[0].users == 1) - assert(len(bpy.data.objects) == 1) # Instance created for the mesh ObData. - assert(bpy.data.objects[0].library is None) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.materials) == 1 + assert bpy.data.materials[0].library is not None + assert bpy.data.materials[0].users == 2 # Fake user is not cleared when linking. + assert len(bpy.data.meshes) == 1 + assert bpy.data.meshes[0].library is None + assert bpy.data.meshes[0].use_fake_user is False + assert bpy.data.meshes[0].users == 1 + assert len(bpy.data.objects) == 1 # Instance created for the mesh ObData. + assert bpy.data.objects[0].library is None + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here # Simple append of a single ObData with fake user. self.reset_blender() @@ -246,15 +246,15 @@ class TestBlendLibAppendBasic(TestBlendLibLinkHelper): bpy.ops.wm.append(directory=link_dir, filename="LibMesh", instance_object_data=False, set_fake=True, use_recursive=False, do_reuse_local_id=False) - assert(len(bpy.data.materials) == 1) - assert(bpy.data.materials[0].library is not None) - assert(bpy.data.materials[0].users == 2) # Fake user is not cleared when linking. - assert(len(bpy.data.meshes) == 1) - assert(bpy.data.meshes[0].library is None) - assert(bpy.data.meshes[0].use_fake_user is True) - assert(bpy.data.meshes[0].users == 1) - assert(len(bpy.data.objects) == 0) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.materials) == 1 + assert bpy.data.materials[0].library is not None + assert bpy.data.materials[0].users == 2 # Fake user is not cleared when linking. + assert len(bpy.data.meshes) == 1 + assert bpy.data.meshes[0].library is None + assert bpy.data.meshes[0].use_fake_user is True + assert bpy.data.meshes[0].users == 1 + assert len(bpy.data.objects) == 0 + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here # Simple append of a single Object. self.reset_blender() @@ -263,16 +263,16 @@ class TestBlendLibAppendBasic(TestBlendLibLinkHelper): bpy.ops.wm.append(directory=link_dir, filename="LibMesh", instance_object_data=False, set_fake=False, use_recursive=False, do_reuse_local_id=False) - assert(len(bpy.data.materials) == 1) - assert(bpy.data.materials[0].library is not None) - assert(bpy.data.materials[0].users == 2) # Fake user is not cleared when linking. - assert(len(bpy.data.meshes) == 1) - assert(bpy.data.meshes[0].library is None) - assert(bpy.data.meshes[0].users == 1) - assert(len(bpy.data.objects) == 1) - assert(bpy.data.objects[0].library is None) - assert(bpy.data.objects[0].users == 1) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.materials) == 1 + assert bpy.data.materials[0].library is not None + assert bpy.data.materials[0].users == 2 # Fake user is not cleared when linking. + assert len(bpy.data.meshes) == 1 + assert bpy.data.meshes[0].library is None + assert bpy.data.meshes[0].users == 1 + assert len(bpy.data.objects) == 1 + assert bpy.data.objects[0].library is None + assert bpy.data.objects[0].users == 1 + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here # Simple recursive append of a single Object. self.reset_blender() @@ -281,16 +281,16 @@ class TestBlendLibAppendBasic(TestBlendLibLinkHelper): bpy.ops.wm.append(directory=link_dir, filename="LibMesh", instance_object_data=False, set_fake=False, use_recursive=True, do_reuse_local_id=False) - assert(len(bpy.data.materials) == 1) - assert(bpy.data.materials[0].library is None) - assert(bpy.data.materials[0].users == 1) # Fake user is cleared when appending. - assert(len(bpy.data.meshes) == 1) - assert(bpy.data.meshes[0].library is None) - assert(bpy.data.meshes[0].users == 1) - assert(len(bpy.data.objects) == 1) - assert(bpy.data.objects[0].library is None) - assert(bpy.data.objects[0].users == 1) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.materials) == 1 + assert bpy.data.materials[0].library is None + assert bpy.data.materials[0].users == 1 # Fake user is cleared when appending. + assert len(bpy.data.meshes) == 1 + assert bpy.data.meshes[0].library is None + assert bpy.data.meshes[0].users == 1 + assert len(bpy.data.objects) == 1 + assert bpy.data.objects[0].library is None + assert bpy.data.objects[0].users == 1 + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here # Simple recursive append of a single Collection. self.reset_blender() @@ -299,17 +299,17 @@ class TestBlendLibAppendBasic(TestBlendLibLinkHelper): bpy.ops.wm.append(directory=link_dir, filename="LibMesh", instance_object_data=False, set_fake=False, use_recursive=True, do_reuse_local_id=False) - assert(len(bpy.data.materials) == 1) - assert(bpy.data.materials[0].library is None) - assert(bpy.data.materials[0].users == 1) # Fake user is cleared when appending. - assert(bpy.data.meshes[0].library is None) - assert(bpy.data.meshes[0].users == 1) - assert(len(bpy.data.objects) == 1) - assert(bpy.data.objects[0].library is None) - assert(bpy.data.objects[0].users == 1) - assert(len(bpy.data.collections) == 1) # Scene's master collection is not listed here - assert(bpy.data.collections[0].library is None) - assert(bpy.data.collections[0].users == 1) + assert len(bpy.data.materials) == 1 + assert bpy.data.materials[0].library is None + assert bpy.data.materials[0].users == 1 # Fake user is cleared when appending. + assert bpy.data.meshes[0].library is None + assert bpy.data.meshes[0].users == 1 + assert len(bpy.data.objects) == 1 + assert bpy.data.objects[0].library is None + assert bpy.data.objects[0].users == 1 + assert len(bpy.data.collections) == 1 # Scene's master collection is not listed here + assert bpy.data.collections[0].library is None + assert bpy.data.collections[0].users == 1 class TestBlendLibAppendReuseID(TestBlendLibLinkHelper): @@ -328,51 +328,51 @@ class TestBlendLibAppendReuseID(TestBlendLibLinkHelper): bpy.ops.wm.append(directory=link_dir, filename="LibMesh", instance_object_data=False, set_fake=False, use_recursive=True, do_reuse_local_id=False) - assert(len(bpy.data.meshes) == 1) - assert(bpy.data.meshes[0].library is None) - assert(bpy.data.meshes[0].use_fake_user is False) - assert(bpy.data.meshes[0].users == 1) - assert(bpy.data.meshes[0].library_weak_reference is not None) - assert(bpy.data.meshes[0].library_weak_reference.filepath == output_lib_path) - assert(bpy.data.meshes[0].library_weak_reference.id_name == "MELibMesh") - assert(len(bpy.data.objects) == 1) + assert len(bpy.data.meshes) == 1 + assert bpy.data.meshes[0].library is None + assert bpy.data.meshes[0].use_fake_user is False + assert bpy.data.meshes[0].users == 1 + assert bpy.data.meshes[0].library_weak_reference is not None + assert bpy.data.meshes[0].library_weak_reference.filepath == output_lib_path + assert bpy.data.meshes[0].library_weak_reference.id_name == "MELibMesh" + assert len(bpy.data.objects) == 1 for ob in bpy.data.objects: - assert(ob.library is None) - assert(ob.library_weak_reference is None) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert ob.library is None + assert ob.library_weak_reference is None + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here bpy.ops.wm.append(directory=link_dir, filename="LibMesh", instance_object_data=False, set_fake=False, use_recursive=True, do_reuse_local_id=True) - assert(len(bpy.data.meshes) == 1) - assert(bpy.data.meshes[0].library is None) - assert(bpy.data.meshes[0].use_fake_user is False) - assert(bpy.data.meshes[0].users == 2) - assert(bpy.data.meshes[0].library_weak_reference is not None) - assert(bpy.data.meshes[0].library_weak_reference.filepath == output_lib_path) - assert(bpy.data.meshes[0].library_weak_reference.id_name == "MELibMesh") - assert(len(bpy.data.objects) == 2) + assert len(bpy.data.meshes) == 1 + assert bpy.data.meshes[0].library is None + assert bpy.data.meshes[0].use_fake_user is False + assert bpy.data.meshes[0].users == 2 + assert bpy.data.meshes[0].library_weak_reference is not None + assert bpy.data.meshes[0].library_weak_reference.filepath == output_lib_path + assert bpy.data.meshes[0].library_weak_reference.id_name == "MELibMesh" + assert len(bpy.data.objects) == 2 for ob in bpy.data.objects: - assert(ob.library is None) - assert(ob.library_weak_reference is None) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert ob.library is None + assert ob.library_weak_reference is None + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here bpy.ops.wm.append(directory=link_dir, filename="LibMesh", instance_object_data=False, set_fake=False, use_recursive=True, do_reuse_local_id=False) - assert(len(bpy.data.meshes) == 2) - assert(bpy.data.meshes[0].library_weak_reference is None) - assert(bpy.data.meshes[1].library is None) - assert(bpy.data.meshes[1].use_fake_user is False) - assert(bpy.data.meshes[1].users == 1) - assert(bpy.data.meshes[1].library_weak_reference is not None) - assert(bpy.data.meshes[1].library_weak_reference.filepath == output_lib_path) - assert(bpy.data.meshes[1].library_weak_reference.id_name == "MELibMesh") - assert(len(bpy.data.objects) == 3) + assert len(bpy.data.meshes) == 2 + assert bpy.data.meshes[0].library_weak_reference is None + assert bpy.data.meshes[1].library is None + assert bpy.data.meshes[1].use_fake_user is False + assert bpy.data.meshes[1].users == 1 + assert bpy.data.meshes[1].library_weak_reference is not None + assert bpy.data.meshes[1].library_weak_reference.filepath == output_lib_path + assert bpy.data.meshes[1].library_weak_reference.id_name == "MELibMesh" + assert len(bpy.data.objects) == 3 for ob in bpy.data.objects: - assert(ob.library is None) - assert(ob.library_weak_reference is None) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert ob.library is None + assert ob.library_weak_reference is None + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here class TestBlendLibLibraryReload(TestBlendLibLinkHelper): @@ -390,9 +390,9 @@ class TestBlendLibLibraryReload(TestBlendLibLinkHelper): link_dir = os.path.join(output_lib_path, "Object") bpy.ops.wm.link(directory=link_dir, filename="LibMesh") - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.objects) == 1) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.objects) == 1 + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here orig_data = self.blender_data_to_tuple(bpy.data, "orig_data") @@ -402,7 +402,7 @@ class TestBlendLibLibraryReload(TestBlendLibLinkHelper): print(orig_data) print(reload_data) - assert(orig_data == reload_data) + assert orig_data == reload_data class TestBlendLibLibraryRelocate(TestBlendLibLinkHelper): @@ -420,9 +420,9 @@ class TestBlendLibLibraryRelocate(TestBlendLibLinkHelper): link_dir = os.path.join(output_lib_path, "Object") bpy.ops.wm.link(directory=link_dir, filename="LibMesh") - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.objects) == 1) - assert(len(bpy.data.collections) == 0) # Scene's master collection is not listed here + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.objects) == 1 + assert len(bpy.data.collections) == 0 # Scene's master collection is not listed here orig_data = self.blender_data_to_tuple(bpy.data, "orig_data") @@ -436,7 +436,7 @@ class TestBlendLibLibraryRelocate(TestBlendLibLinkHelper): print(orig_data) print(relocate_data) - assert(orig_data == relocate_data) + assert orig_data == relocate_data class TestBlendLibDataLibrariesLoad(TestBlendLibLinkHelper): @@ -454,21 +454,21 @@ class TestBlendLibDataLibrariesLoad(TestBlendLibLinkHelper): with bpy.data.libraries.load(filepath=output_lib_path) as lib_ctx: lib_src, lib_link = lib_ctx - assert(len(lib_src.meshes) == 1) - assert(len(lib_src.objects) == 1) - assert(len(lib_src.collections) == 1) + assert len(lib_src.meshes) == 1 + assert len(lib_src.objects) == 1 + assert len(lib_src.collections) == 1 - assert(len(lib_link.meshes) == 0) - assert(len(lib_link.objects) == 0) - assert(len(lib_link.collections) == 0) + assert len(lib_link.meshes) == 0 + assert len(lib_link.objects) == 0 + assert len(lib_link.collections) == 0 lib_link.collections.append(lib_src.collections[0]) # Linking happens when living the context manager. - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.objects) == 1) # This code does no instantiation. - assert(len(bpy.data.collections) == 1) + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.objects) == 1 # This code does no instantiation. + assert len(bpy.data.collections) == 1 TESTS = ( diff --git a/tests/python/bl_blendfile_library_overrides.py b/tests/python/bl_blendfile_library_overrides.py index 3ba99bd61e4..6890bb1e660 100644 --- a/tests/python/bl_blendfile_library_overrides.py +++ b/tests/python/bl_blendfile_library_overrides.py @@ -57,49 +57,49 @@ class TestLibraryOverrides(TestHelper, unittest.TestCase): local_id = obj.override_create() self.assertIsNotNone(local_id.override_library) self.assertIsNone(local_id.data.override_library) - assert(len(local_id.override_library.properties) == 0) + assert len(local_id.override_library.properties) == 0 # #### Generate an override property & operation automatically by editing the local override data. local_id.location.y = 1.0 local_id.override_library.operations_update() - assert(len(local_id.override_library.properties) == 1) + assert len(local_id.override_library.properties) == 1 override_prop = local_id.override_library.properties[0] - assert(override_prop.rna_path == "location") - assert(len(override_prop.operations) == 1) + assert override_prop.rna_path == "location" + assert len(override_prop.operations) == 1 override_operation = override_prop.operations[0] - assert(override_operation.operation == 'REPLACE') + assert override_operation.operation == 'REPLACE' # Setting location.y overrode all elements in the location array. -1 is a wildcard. - assert(override_operation.subitem_local_index == -1) + assert override_operation.subitem_local_index == -1 # #### Reset the override to its linked reference data. local_id.override_library.reset() - assert(len(local_id.override_library.properties) == 0) - assert(local_id.location == local_id.override_library.reference.location) + assert len(local_id.override_library.properties) == 0 + assert local_id.location == local_id.override_library.reference.location # #### Generate an override property & operation manually using the API. override_property = local_id.override_library.properties.add(rna_path="location") override_property.operations.add(operation='REPLACE') - assert(len(local_id.override_library.properties) == 1) + assert len(local_id.override_library.properties) == 1 override_prop = local_id.override_library.properties[0] - assert(override_prop.rna_path == "location") - assert(len(override_prop.operations) == 1) + assert override_prop.rna_path == "location" + assert len(override_prop.operations) == 1 override_operation = override_prop.operations[0] - assert(override_operation.operation == 'REPLACE') + assert override_operation.operation == 'REPLACE' # Setting location.y overrode all elements in the location array. -1 is a wildcard. - assert(override_operation.subitem_local_index == -1) + assert override_operation.subitem_local_index == -1 override_property = local_id.override_library.properties[0] override_property.operations.remove(override_property.operations[0]) local_id.override_library.properties.remove(override_property) - assert(len(local_id.override_library.properties) == 0) + assert len(local_id.override_library.properties) == 0 # #### Delete the override. local_id_name = local_id.name - assert(bpy.data.objects.get((local_id_name, None), None) == local_id) + assert bpy.data.objects.get((local_id_name, None), None) == local_id local_id.override_library.destroy() - assert(bpy.data.objects.get((local_id_name, None), None) is None) + assert bpy.data.objects.get((local_id_name, None), None) is None def test_link_permissive(self): """ @@ -119,39 +119,39 @@ class TestLibraryOverrides(TestHelper, unittest.TestCase): local_id = obj.override_create() self.assertIsNotNone(local_id.override_library) self.assertIsNone(local_id.data.override_library) - assert(len(local_id.override_library.properties) == 1) + assert len(local_id.override_library.properties) == 1 override_prop = local_id.override_library.properties[0] - assert(override_prop.rna_path == "scale") - assert(len(override_prop.operations) == 1) + assert override_prop.rna_path == "scale" + assert len(override_prop.operations) == 1 override_operation = override_prop.operations[0] - assert(override_operation.operation == 'NOOP') - assert(override_operation.subitem_local_index == -1) + assert override_operation.operation == 'NOOP' + assert override_operation.subitem_local_index == -1 local_id.location.y = 1.0 local_id.scale.x = 0.5 # `scale.x` will apply, but will be reverted when the library overrides # are updated. This is by design so python scripts can still alter the # properties locally what is a typical usecase in productions. - assert(local_id.scale.x == 0.5) - assert(local_id.location.y == 1.0) + assert local_id.scale.x == 0.5 + assert local_id.location.y == 1.0 local_id.override_library.operations_update() - assert(local_id.scale.x == 1.0) - assert(local_id.location.y == 1.0) + assert local_id.scale.x == 1.0 + assert local_id.location.y == 1.0 - assert(len(local_id.override_library.properties) == 2) + assert len(local_id.override_library.properties) == 2 override_prop = local_id.override_library.properties[0] - assert(override_prop.rna_path == "scale") - assert(len(override_prop.operations) == 1) + assert override_prop.rna_path == "scale" + assert len(override_prop.operations) == 1 override_operation = override_prop.operations[0] - assert(override_operation.operation == 'NOOP') - assert(override_operation.subitem_local_index == -1) + assert override_operation.operation == 'NOOP' + assert override_operation.subitem_local_index == -1 override_prop = local_id.override_library.properties[1] - assert(override_prop.rna_path == "location") - assert(len(override_prop.operations) == 1) + assert override_prop.rna_path == "location" + assert len(override_prop.operations) == 1 override_operation = override_prop.operations[0] - assert(override_operation.operation == 'REPLACE') - assert (override_operation.subitem_local_index == -1) + assert override_operation.operation == 'REPLACE' + assert override_operation.subitem_local_index == -1 class TestLibraryTemplate(TestHelper, unittest.TestCase): @@ -169,16 +169,16 @@ class TestLibraryTemplate(TestHelper, unittest.TestCase): mesh = bpy.data.meshes.new(TestLibraryTemplate.MESH_LIBRARY_PERMISSIVE) obj = bpy.data.objects.new(TestLibraryTemplate.OBJECT_LIBRARY_PERMISSIVE, object_data=mesh) bpy.context.collection.objects.link(obj) - assert(obj.override_library is None) + assert obj.override_library is None obj.override_template_create() - assert(obj.override_library is not None) - assert(len(obj.override_library.properties) == 0) + assert obj.override_library is not None + assert len(obj.override_library.properties) == 0 prop = obj.override_library.properties.add(rna_path='scale') - assert(len(obj.override_library.properties) == 1) - assert(len(prop.operations) == 0) + assert len(obj.override_library.properties) == 1 + assert len(prop.operations) == 0 operation = prop.operations.add(operation='NOOP') - assert(len(prop.operations) == 1) - assert(operation.operation == 'NOOP') + assert len(prop.operations) == 1 + assert operation.operation == 'NOOP' class TestLibraryOverridesResync(TestHelper, unittest.TestCase): @@ -237,30 +237,30 @@ class TestLibraryOverridesResync(TestHelper, unittest.TestCase): ) linked_collection_container = bpy.data.collections[TestLibraryOverridesResync.DATA_NAME_CONTAINER] - assert(linked_collection_container.library is not None) - assert(linked_collection_container.override_library is None) - assert(len(bpy.data.collections) == 2) - assert(all(id_.library is not None for id_ in bpy.data.collections)) - assert(len(bpy.data.objects) == 4) - assert(all(id_.library is not None for id_ in bpy.data.objects)) - assert(len(bpy.data.meshes) == 1) - assert(all(id_.library is not None for id_ in bpy.data.meshes)) - assert(len(bpy.data.armatures) == 1) - assert(all(id_.library is not None for id_ in bpy.data.armatures)) + assert linked_collection_container.library is not None + assert linked_collection_container.override_library is None + assert len(bpy.data.collections) == 2 + assert all(id_.library is not None for id_ in bpy.data.collections) + assert len(bpy.data.objects) == 4 + assert all(id_.library is not None for id_ in bpy.data.objects) + assert len(bpy.data.meshes) == 1 + assert all(id_.library is not None for id_ in bpy.data.meshes) + assert len(bpy.data.armatures) == 1 + assert all(id_.library is not None for id_ in bpy.data.armatures) override_collection_container = linked_collection_container.override_hierarchy_create( bpy.context.scene, bpy.context.view_layer, ) - assert(override_collection_container.library is None) - assert(override_collection_container.override_library is not None) + assert override_collection_container.library is None + assert override_collection_container.override_library is not None # Objects and collections are duplicated as overrides, but meshes and armatures remain only linked data. - assert(len(bpy.data.collections) == 4) - assert(all((id_.library is None and id_.override_library is not None) for id_ in bpy.data.collections[:2])) - assert(len(bpy.data.objects) == 8) - assert(all((id_.library is None and id_.override_library is not None) for id_ in bpy.data.objects[:4])) - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.armatures) == 1) + assert len(bpy.data.collections) == 4 + assert all((id_.library is None and id_.override_library is not None) for id_ in bpy.data.collections[:2]) + assert len(bpy.data.objects) == 8 + assert all((id_.library is None and id_.override_library is not None) for id_ in bpy.data.objects[:4]) + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.armatures) == 1 bpy.ops.wm.save_as_mainfile(filepath=str(self.test_output_path), check_existing=False, compress=False) @@ -279,21 +279,21 @@ class TestLibraryOverridesResync(TestHelper, unittest.TestCase): bpy.ops.wm.open_mainfile(filepath=str(self.test_output_path)) override_collection_container = bpy.data.collections[TestLibraryOverridesResync.DATA_NAME_CONTAINER] - assert(override_collection_container.library is None) - assert(override_collection_container.override_library is not None) + assert override_collection_container.library is None + assert override_collection_container.override_library is not None # Objects and collections are duplicated as overrides, but meshes and armatures remain only linked data. - assert(len(bpy.data.collections) == 4) - assert(all((id_.library is None and id_.override_library is not None) for id_ in bpy.data.collections[:2])) - assert(len(bpy.data.objects) == 8) - assert(all((id_.library is None and id_.override_library is not None) for id_ in bpy.data.objects[:4])) - assert(len(bpy.data.meshes) == 1) - assert(len(bpy.data.armatures) == 1) + assert len(bpy.data.collections) == 4 + assert all((id_.library is None and id_.override_library is not None) for id_ in bpy.data.collections[:2]) + assert len(bpy.data.objects) == 8 + assert all((id_.library is None and id_.override_library is not None) for id_ in bpy.data.objects[:4]) + assert len(bpy.data.meshes) == 1 + assert len(bpy.data.armatures) == 1 obj_armature = bpy.data.objects[TestLibraryOverridesResync.DATA_NAME_RIG] obj_ctrl2 = bpy.data.objects[TestLibraryOverridesResync.DATA_NAME_CONTROLLER_2] - assert(obj_armature.library is None and obj_armature.override_library is not None) - assert(obj_ctrl2.library is None and obj_ctrl2.override_library is not None) - assert(obj_armature.constraints[0].target == obj_ctrl2) + assert obj_armature.library is None and obj_armature.override_library is not None + assert obj_ctrl2.library is None and obj_ctrl2.override_library is not None + assert obj_armature.constraints[0].target == obj_ctrl2 TESTS = ( diff --git a/tests/python/bl_keymap_validate.py b/tests/python/bl_keymap_validate.py index 83d41c8a9f6..11da4d562b0 100644 --- a/tests/python/bl_keymap_validate.py +++ b/tests/python/bl_keymap_validate.py @@ -228,7 +228,7 @@ def keyconfig_activate_and_extract_data( bpy.ops.preferences.keyconfig_activate(filepath=filepath) # If called multiple times, something strange is happening. - assert(len(args_collected) == 1) + assert len(args_collected) == 1 args, _kw = args_collected[0] # Ignore the type check as `temp_fn_argument_extractor` is a generic function # which doesn't contain type information of the function being wrapped. diff --git a/tests/python/bl_load_addons.py b/tests/python/bl_load_addons.py index b94c56541af..b67bc22102c 100644 --- a/tests/python/bl_load_addons.py +++ b/tests/python/bl_load_addons.py @@ -57,7 +57,7 @@ def disable_addons(): addons = bpy.context.preferences.addons for mod_name in list(addons.keys()): addon_utils.disable(mod_name, default_set=True) - assert(bool(addons) is False) + assert bool(addons) is False def test_load_addons(): @@ -97,13 +97,13 @@ def reload_addons(do_reload=True, do_reverse=True): mod_name = mod.__name__ print("\tenabling:", mod_name) addon_utils.enable(mod_name, default_set=True) - assert(mod_name in addons) + assert mod_name in addons for mod in modules: mod_name = mod.__name__ print("\tdisabling:", mod_name) addon_utils.disable(mod_name, default_set=True) - assert(not (mod_name in addons)) + assert not (mod_name in addons) # now test reloading if do_reload: diff --git a/tests/python/bl_load_py_modules.py b/tests/python/bl_load_py_modules.py index 7ad5895ce86..784d8984935 100644 --- a/tests/python/bl_load_py_modules.py +++ b/tests/python/bl_load_py_modules.py @@ -161,7 +161,7 @@ def load_modules(): sys.path[:] = sys_path_back # check we load what we ask for. - assert(os.path.samefile(mod_imp.__file__, submod_full)) + assert os.path.samefile(mod_imp.__file__, submod_full) modules.append(mod_imp) except Exception: diff --git a/tests/python/bl_mesh_modifiers.py b/tests/python/bl_mesh_modifiers.py index 640cf1c30f2..5498316b267 100644 --- a/tests/python/bl_mesh_modifiers.py +++ b/tests/python/bl_mesh_modifiers.py @@ -55,8 +55,8 @@ def render_gl(context, filepath, shade): def render_gl_all_modes(context, obj, filepath=""): - assert(obj is not None) - assert(filepath != "") + assert obj is not None + assert filepath != "" scene = context.scene @@ -91,7 +91,7 @@ def render_gl_all_modes(context, obj, filepath=""): render_gl(context, filepath + "_wp_wire", shade='WIREFRAME') - assert(1) + assert 1 bpy.ops.object.mode_set(mode='OBJECT', toggle=False) diff --git a/tests/python/bl_pyapi_idprop.py b/tests/python/bl_pyapi_idprop.py index ddb5be03594..ddce132dd5a 100644 --- a/tests/python/bl_pyapi_idprop.py +++ b/tests/python/bl_pyapi_idprop.py @@ -22,7 +22,7 @@ class TestHelper: def setUp(self): self._id = bpy.context.scene self._id.pop("cycles", None) - assert(len(self._id.keys()) == 0) + assert len(self._id.keys()) == 0 def tearDown(self): for key in list(self._id.keys()): diff --git a/tests/python/bl_rna_manual_reference.py b/tests/python/bl_rna_manual_reference.py index 257c8b7601a..958cc46ae29 100644 --- a/tests/python/bl_rna_manual_reference.py +++ b/tests/python/bl_rna_manual_reference.py @@ -15,12 +15,12 @@ import bpy def test_data(): import rna_manual_reference - assert(isinstance(rna_manual_reference.url_manual_mapping, tuple)) + assert isinstance(rna_manual_reference.url_manual_mapping, tuple) for i, value in enumerate(rna_manual_reference.url_manual_mapping): try: - assert(len(value) == 2) - assert(isinstance(value[0], str)) - assert(isinstance(value[1], str)) + assert len(value) == 2 + assert isinstance(value[0], str) + assert isinstance(value[1], str) except: print("Expected a tuple of 2 strings, instead item %d is a %s: %r" % (i, type(value), value)) import traceback diff --git a/tests/python/bl_run_operators_event_simulate.py b/tests/python/bl_run_operators_event_simulate.py index d218e6b1bc0..e17eaef0480 100644 --- a/tests/python/bl_run_operators_event_simulate.py +++ b/tests/python/bl_run_operators_event_simulate.py @@ -461,7 +461,7 @@ class BlenderAction(argparse.Action): except ArgumentTypeError as ex: raise ArgumentTypeError("Invalid 'action' arguments \"%s\" at index %d, %s" % (value, index, str(ex))) # Validation should never yield any events. - assert(not dummy_result) + assert not dummy_result return (op, args, kwargs) |