Cleanup: pep8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2018 05:12:24 +0000 (07:12 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2018 05:12:24 +0000 (07:12 +0200)
50 files changed:
tests/python/eevee_render_tests.py
tests/python/view_layer/test_active_collection.py
tests/python/view_layer/test_collection_new_sync.py
tests/python/view_layer/test_group_d.py
tests/python/view_layer/test_layer_linking.py
tests/python/view_layer/test_layer_syncing.py
tests/python/view_layer/test_make_single_user.py
tests/python/view_layer/test_move_above_below_layer_collection_f.py
tests/python/view_layer/test_move_above_below_layer_collection_g.py
tests/python/view_layer/test_move_above_below_layer_collection_i.py
tests/python/view_layer/test_move_above_below_layer_collection_l.py
tests/python/view_layer/test_move_above_below_scene_collection_a.py
tests/python/view_layer/test_move_above_below_scene_collection_b.py
tests/python/view_layer/test_move_above_below_scene_collection_c.py
tests/python/view_layer/test_move_above_below_scene_collection_d.py
tests/python/view_layer/test_move_above_below_scene_collection_e.py
tests/python/view_layer/test_move_above_below_scene_collection_f.py
tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py
tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py
tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py
tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py
tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py
tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py
tests/python/view_layer/test_move_into_layer_collection_a.py
tests/python/view_layer/test_move_into_layer_collection_f.py
tests/python/view_layer/test_move_into_layer_collection_g.py
tests/python/view_layer/test_move_into_layer_collection_h.py
tests/python/view_layer/test_move_into_scene_collection_a.py
tests/python/view_layer/test_move_into_scene_collection_b.py
tests/python/view_layer/test_move_into_scene_collection_c.py
tests/python/view_layer/test_move_into_scene_collection_e.py
tests/python/view_layer/test_move_into_scene_collection_f.py
tests/python/view_layer/test_move_into_scene_collection_g.py
tests/python/view_layer/test_move_into_scene_collection_h.py
tests/python/view_layer/test_move_into_scene_collection_i.py
tests/python/view_layer/test_move_into_scene_collection_sync_b.py
tests/python/view_layer/test_move_into_scene_collection_sync_c.py
tests/python/view_layer/test_move_into_scene_collection_sync_e.py
tests/python/view_layer/test_move_into_scene_collection_sync_f.py
tests/python/view_layer/test_move_into_scene_collection_sync_g.py
tests/python/view_layer/test_move_into_scene_collection_sync_h.py
tests/python/view_layer/test_move_into_scene_collection_sync_i.py
tests/python/view_layer/test_object_copy.py
tests/python/view_layer/test_operator_context.py
tests/python/view_layer/test_scene_copy_a.py
tests/python/view_layer/test_scene_copy_b.py
tests/python/view_layer/test_scene_copy_c.py
tests/python/view_layer/test_scene_copy_d.py
tests/python/view_layer/test_scene_write_read.py
tests/python/view_layer/view_layer_common.py

index 74e716dc8e681d8a09c5455d00d279a305beaf90..48751e6bbcb70a81cfc0e1cb71f0935e02ec631e 100755 (executable)
@@ -8,6 +8,7 @@ import shutil
 import subprocess
 import sys
 
+
 def setup():
     import bpy
 
@@ -29,6 +30,7 @@ def setup():
         mat.use_screen_refraction = True
         mat.use_screen_subsurface = True
 
+
 # When run from inside Blender, render and exit.
 try:
     import bpy
index 10df71f77ce87a72320c3aff2efca1ca37f11410..1c6c3cd1983247946f3df80423181d15a273c0dd 100644 (file)
@@ -42,23 +42,23 @@ class UnitTesting(ViewLayerTesting):
         layer.collections.link(subzero)
 
         lookup = [
-                'Master Collection',
-                '1',
-                'sub-zero',
-                'scorpion',
-                '2',
-                '3',
-                '4',
-                '5',
-                'sub-zero',
-                'scorpion']
+            'Master Collection',
+            '1',
+            'sub-zero',
+            'scorpion',
+            '2',
+            '3',
+            '4',
+            '5',
+            'sub-zero',
+            'scorpion']
 
         for i, name in enumerate(lookup):
             layer.collections.active_index = i
             self.assertEqual(
-                    name, layer.collections.active.name,
-                    "Collection index mismatch: [{0}] : {1} != {2}".format(
-                        i, name, layer.collections.active.name))
+                name, layer.collections.active.name,
+                "Collection index mismatch: [{0}] : {1} != {2}".format(
+                    i, name, layer.collections.active.name))
 
 
 # ############################################################
index 582e6c13d897fd215f28f6cceb5ef629471f3fe8..46b63c64f4560a47c84241d30714b43635cac502 100644 (file)
@@ -26,16 +26,16 @@ class UnitTesting(ViewLayerTesting):
         self.assertEqual(view_layer.collections[0].collection, scene.master_collection)
 
         self.assertEqual(
-                {collection.name for collection in view_layer.collections[0].collections},
-                {'Collection 1'})
+            {collection.name for collection in view_layer.collections[0].collections},
+            {'Collection 1'})
 
         self.assertEqual(
-                bpy.ops.outliner.collection_new(),
-                {'FINISHED'})
+            bpy.ops.outliner.collection_new(),
+            {'FINISHED'})
 
         self.assertEqual(
-                {collection.name for collection in view_layer.collections[0].collections},
-                {'Collection 1', 'Collection 2'})
+            {collection.name for collection in view_layer.collections[0].collections},
+            {'Collection 1', 'Collection 2'})
 
 
 # ############################################################
index 6f54ca5340aa2aeb65bcaa8c67a2a9a90fd1f249..709d27df1843758e5be66927f356f6c266fad183 100644 (file)
@@ -46,7 +46,6 @@ class UnitTesting(ViewLayerTesting):
                 self.assertEqual(1, bpy.data.groups[0].users)
                 self.assertEqual(3, len(bpy.data.groups[0].objects))
 
-
             # empty the group of objects
             group = bpy.data.groups[0]
             while group.objects:
index 4c66c564d7c5fdfbd72fda5464520beb329957dd..43c88aa65f96d11a1ef5876a5a71545b1416365d 100644 (file)
@@ -67,7 +67,7 @@ class UnitTesting(ViewLayerTesting):
             self.assertTrue(compare_files(
                 filepath_nested_json,
                 filepath_json,
-                ),
+            ),
                 "Scene dump files differ")
 
     def test_syncing_layer_new(self):
index d8175c4850fb6b866d36ee3e2f072fef44d291dd..9baf25f9e9e7f6ee46bc806ef29d9853bab1cb87 100644 (file)
@@ -68,7 +68,7 @@ class UnitTesting(ViewLayerTesting):
             self.assertTrue(compare_files(
                 filepath_nested_json,
                 filepath_json,
-                ),
+            ),
                 "Scene dump files differ")
 
     def test_syncing_link(self):
index 2a8a479bab26371b8a644b3c04d8ababe3d811ba..292c2d506055e63775c7f33cc932fe93301d74c8 100644 (file)
@@ -33,7 +33,7 @@ class UnitTesting(ViewLayerTesting):
 
         while master_collection.collections:
             master_collection.collections.remove(
-                    master_collection.collections[0])
+                master_collection.collections[0])
 
         view_layer.collections.link(master_collection)
         ob.select_set('SELECT')
index 77d65ef8671e3d11b9f2c6a8b409bbb2a25829e1..036486bf55a4aee30669be8239357aeb6ff47103 100644 (file)
@@ -16,36 +16,36 @@ from view_layer_common import *
 class UnitTesting(MoveLayerCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['2', None],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+                ['2', None],
+            ]],
+        ]
         return reference_tree_map
 
     def get_reference_layers_tree_map(self):
         reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
+            ['Layer 1', [
+                'Master Collection',
+                'C',
+                '3',
+            ]],
+            ['Layer 2', [
+                'C',
+                'dog',
+                'cat',
+            ]],
+        ]
         return reference_layers_map
 
     def test_layer_collection_move_a(self):
index 16cd628edfcde402f3380f0add12938d47a15854..aca6c5d5ff67d45da6667bff03f807934f5c207c 100644 (file)
@@ -16,21 +16,21 @@ from view_layer_common import *
 class UnitTesting(MoveLayerCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['cat', None],
-                        ['dog', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['cat', None],
+                    ['dog', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def get_reference_layers_tree_map(self):
index 0134d11adcdfb1102d1c46481c88a97ec323f373..dada882a412bd003b57af6cbc01dce1f523e21e5 100644 (file)
@@ -20,18 +20,18 @@ class UnitTesting(MoveLayerCollectionTesting):
 
     def get_reference_layers_tree_map(self):
         reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    '3',
-                    'C',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
+            ['Layer 1', [
+                'Master Collection',
+                'C',
+                '3',
+            ]],
+            ['Layer 2', [
+                '3',
+                'C',
+                'dog',
+                'cat',
+            ]],
+        ]
         return reference_layers_map
 
     def test_layer_collection_move_a(self):
index 2bc1054ec7ed73a851ec976119d169d4042b7922..a8fad4146851688dac466647ffa27ff0f8850945 100644 (file)
@@ -20,18 +20,18 @@ class UnitTesting(MoveLayerCollectionTesting):
 
     def get_reference_layers_tree_map(self):
         reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    'cat',
-                    '3',
-                    'dog',
-                    ]],
-                ]
+            ['Layer 1', [
+                'Master Collection',
+                'C',
+                '3',
+            ]],
+            ['Layer 2', [
+                'C',
+                'cat',
+                '3',
+                'dog',
+            ]],
+        ]
         return reference_layers_map
 
     def test_layer_collection_move_a(self):
index 3e45102e0b22ddf92059a858ee37a91e0248814b..f558491527e5cc2eb1f1733a153d9bbe771d16b0 100644 (file)
@@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         # original tree, no changes
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move_a(self):
index 839807058463ca53d1939b5bb3f4d4caccdb24f6..037ee01e20575fab546bb8e0195895f458916d8b 100644 (file)
@@ -16,21 +16,21 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+                ['1', None],
+                ['2', None],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move_a(self):
index cceb2bb235b3c3db7f78d0c80731655020dda6c1..07b67092d3e09673fce47b89aa5cc4360b8e4206 100644 (file)
@@ -16,21 +16,21 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move(self):
index 5917e9ceb6c646da795f8d06433a7709b1b89278..9923d917abfd9f5c7bfce5fa4fede3f3d21253d1 100644 (file)
@@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         # original tree, no changes
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['B', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['B', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move_a(self):
index 12778ff913119b5dbdf2e29bff4269335d54d322..b90768265515424a4b12a8661e4aa0c28228be09 100644 (file)
@@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         # original tree, no changes
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['iii', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['iii', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move_a(self):
index b9d5e8eff248dd5a9149ef6b1f8ef556dd9c22b5..3343d0d774bbcfbfa9bd2c305f910610c3ac0626 100644 (file)
@@ -16,21 +16,21 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['A', [
-                            ['i', None],
-                            ['ii', None],
-                            ['iii', None],
-                            ]],
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['A', [
+                        ['i', None],
+                        ['ii', None],
+                        ['iii', None],
                     ]],
-                ]
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move(self):
index d36930dcbc56ba63f5a7111d051c41966f878da0..73c79b0de879d7c3fa9754a8fbd550a0b03a8ec0 100644 (file)
@@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         # original tree, no changes
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move_a(self):
index 79718e1168a3453ddab75e25cd61ad808fc0b088..552ca0d5c9bf79865064af786621a2b2ea7ec433 100644 (file)
@@ -16,21 +16,21 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+                ['1', None],
+                ['2', None],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move_a(self):
index ef23b722b8b77072150b05a39cf1c936605e776c..c54115b0d134111a8352d5c9fd776dafeaaec190 100644 (file)
@@ -16,21 +16,21 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move(self):
index 05c3bcdbcbbb3e956402443799aaac4183c333f3..bb770f61344e8e4fc25ee681c69eea1876019028 100644 (file)
@@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         # original tree, no changes
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['B', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['B', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move_a(self):
index ebab970ba195aef9c442a2628baf633958e56654..88a77bf8385124eba50e006d168bc9b2788f3469 100644 (file)
@@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         # original tree, no changes
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['iii', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['iii', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move_a(self):
index 7e4f0bc4a9c99172b472d9e86688e97aee0228fe..013165986f4d0b29f7ed239e6192068747818467 100644 (file)
@@ -16,21 +16,21 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['A', [
-                            ['i', None],
-                            ['ii', None],
-                            ['iii', None],
-                            ]],
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['A', [
+                        ['i', None],
+                        ['ii', None],
+                        ['iii', None],
                     ]],
-                ]
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_move(self):
index ef5a839a44a25d9a9bc24239bb2c49699fa97cac..85e24e53463eb4c1e4100f68bf2dee11c933cf26 100644 (file)
@@ -17,38 +17,38 @@ class UnitTesting(MoveLayerCollectionTesting):
     def get_reference_scene_tree_map(self):
         # original tree, no changes
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def get_reference_layers_tree_map(self):
         # original tree, no changes
         reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    '3',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
+            ['Layer 1', [
+                'Master Collection',
+                'C',
+                '3',
+            ]],
+            ['Layer 2', [
+                'C',
+                '3',
+                'dog',
+                'cat',
+            ]],
+        ]
         return reference_layers_map
 
     def test_layer_collection_into(self):
index 7bf007d272462655a0bd31d0f192ade8b00324fe..7595619f42a46a34a46a7eea61595ea0e4eb3638 100644 (file)
@@ -16,36 +16,36 @@ from view_layer_common import *
 class UnitTesting(MoveLayerCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+            ]],
+        ]
         return reference_tree_map
 
     def get_reference_layers_tree_map(self):
         reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    '3',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
+            ['Layer 1', [
+                'Master Collection',
+                'C',
+            ]],
+            ['Layer 2', [
+                'C',
+                '3',
+                'dog',
+                'cat',
+            ]],
+        ]
         return reference_layers_map
 
     def test_layer_collection_into_a(self):
index efcdd44da9782fbe6e8abc993edf5c25834698de..90f6739d249d9f05655042206fa88a6df902b56e 100644 (file)
@@ -20,17 +20,17 @@ class UnitTesting(MoveLayerCollectionTesting):
 
     def get_reference_layers_tree_map(self):
         reference_layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
+            ['Layer 1', [
+                'Master Collection',
+                'C',
+                '3',
+            ]],
+            ['Layer 2', [
+                'C',
+                'dog',
+                'cat',
+            ]],
+        ]
         return reference_layers_map
 
     def test_layer_collection_into_a(self):
index 82f5d70dceb86256421355ea3cc6f987e29cd15e..0e5a86c57ae1cb2767477f5852a4b7d2be96311e 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveLayerCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', [
-                        ['dog', None],
-                        ]],
-                    ['2', None],
-                    ['3', [
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', [
+                    ['dog', None],
+                ]],
+                ['2', None],
+                ['3', [
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def get_reference_layers_tree_map(self):
index c5671d46316d7f885a50eced066dc413dccd4bba..ab997ddf9b6ea492aa3e076fec48baea6857ad21 100644 (file)
@@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         # original tree, no changes
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 08cacde6f0c18c5e78d1504a00aac6904800d7a5..4254a736b40ac34d1435cfe46760ef8d0cff5664 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', [
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', [
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+            ['C', [
+                ['1', None],
+                ['2', None],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 83b1d2fc52bbd8e95b5812393be5cb89bbd28187..1c9aa295f726d07350993d59d8f9e8bda6e0a5ee 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', [
                             ['cat', None],
-                            ]],
-                        ]],
                     ]],
-                ]
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 00a4274c564753d52a653d9d03e5ce07ecf4eb35..f8d37eb769d76489c0336dedbbb61e03f68dfa41 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', [
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', [
                             ['B', None],
-                            ]],
-                        ]],
                     ]],
-                ]
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 4cba04c35a5c3240ffc826a43abc09360e49e41d..a89c7dd81e9241d57b3b09517101fc5fb5e64090 100644 (file)
@@ -16,21 +16,21 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ['B', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                    ['B', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 5ca2658407f91f0a388b2a965458c9befb2c5ae8..04919ca720be47ad6a48b88c369f0974ac54d659 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', [
                             ['A', [
                                 ['i', None],
                                 ['ii', None],
                                 ['iii', None],
-                                ]],
                             ]],
-                        ['cat', None],
-                        ]],
                     ]],
-                ]
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 1524dbad7bc8b806ff82901e37b4852b483c09c8..57b15c4ef44745b664bcd9c1cb448b3258de5921 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', [
-                        ['ii', None],
-                        ]],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', [
+                    ['ii', None],
+                ]],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 2240ba50d75c2544ff658e758508e4d7acb2fec8..7b4076f3fd983d2d52fe0d318c95ed98b9127f31 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
+            ['A', [
+                ['i', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', [
                             ['ii', None],
-                            ]],
-                        ['cat', None],
-                        ]],
                     ]],
-                ]
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index a4d05b57f771965421388ee6f857ce374289d51b..a485d7160d6d2e2ec9c8d69aeac1f80090c34aeb 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', [
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', [
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+            ['C', [
+                ['1', None],
+                ['2', None],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 3f125d513ce27d0bab651dda37244252a7166fc8..e68e1d04a56fe39791a306655a1d1a1ab970ed4f 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', [
                             ['cat', None],
-                            ]],
-                        ]],
                     ]],
-                ]
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 689b4976dab031b011148617c880782e3cf954f2..fac8d46e471e9189a956b74931e98601fb4f4590 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', [
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', [
                             ['B', None],
-                            ]],
-                        ]],
                     ]],
-                ]
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index e486f48aac1ebd389a936c3929a9adc0cc7211ce..bce9e45a764fa5e17c3a0402f84822ed6abc62d0 100644 (file)
@@ -16,21 +16,21 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ['B', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                    ['B', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 3792e9429a3d6f0bb001e61bd2e2cede5e5fea5d..8b08eb9f2102993b4222f434003622978cda5f30 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', [
                             ['A', [
                                 ['i', None],
                                 ['ii', None],
                                 ['iii', None],
-                                ]],
                             ]],
-                        ['cat', None],
-                        ]],
                     ]],
-                ]
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 8b3ceb14d739de053ab7d24eabd36f474f54034a..f7eeb00b1506a1c80b64d8c0bc8d620be0a8b67c 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', [
-                        ['ii', None],
-                        ]],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', [
+                    ['ii', None],
+                ]],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 8262dcc06c1b7e804a410c28b259500cb0605dff..373665dd732e8e162b3e2ef5dfe39b2ab462da6d 100644 (file)
@@ -16,22 +16,22 @@ from view_layer_common import *
 class UnitTesting(MoveSceneCollectionSyncTesting):
     def get_reference_scene_tree_map(self):
         reference_tree_map = [
-                ['A', [
-                    ['i', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', [
+            ['A', [
+                ['i', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', [
                             ['ii', None],
-                            ]],
-                        ['cat', None],
-                        ]],
                     ]],
-                ]
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return reference_tree_map
 
     def test_scene_collection_into(self):
index 15d863f31385bf531fd6b69f49670ca5cbc0adc5..19a7c56b9891b4ba64af221c5de054412f937701 100644 (file)
@@ -68,7 +68,7 @@ class UnitTesting(ViewLayerTesting):
             self.assertTrue(compare_files(
                 filepath_objects_json,
                 filepath_json,
-                ),
+            ),
                 "Scene dump files differ")
 
     def test_copy_object(self):
index 38379aa2a75c35c299a44c6040fd2cb500cdfb42..d11666de118522ade128e31179b33ade8a3c9eb6 100644 (file)
@@ -27,19 +27,19 @@ class UnitTesting(ViewLayerTesting):
             bl_label = "Sample Operator"
 
             view_layer = bpy.props.StringProperty(
-                    default="Not Set",
-                    options={'SKIP_SAVE'},
-                    )
+                default="Not Set",
+                options={'SKIP_SAVE'},
+            )
 
             scene_collection = bpy.props.StringProperty(
-                    default="",
-                    options={'SKIP_SAVE'},
-                    )
+                default="",
+                options={'SKIP_SAVE'},
+            )
 
             use_verbose = bpy.props.BoolProperty(
-                    default=False,
-                    options={'SKIP_SAVE'},
-                    )
+                default=False,
+                options={'SKIP_SAVE'},
+            )
 
             def execute(self, context):
                 view_layer = context.view_layer
index 8cccb26a92d389864b88943cbef692aa464c99d1..8f0f2316ce1aed7338eae24d7366547f9d152579 100644 (file)
@@ -23,9 +23,9 @@ class UnitTesting(ViewLayerTesting):
 
         filepath_layers_json_copy = os.path.join(ROOT, 'layers_copy_full_simple.json')
         self.do_scene_copy(
-                filepath_layers_json_copy,
-                'FULL_COPY',
-                (get_scene_collections,))
+            filepath_layers_json_copy,
+            'FULL_COPY',
+            (get_scene_collections,))
 
 
 # ############################################################
index 1d53b56719df6fe64b40ebc548dc4f46453057a6..73c6976c32c9ceb32e17d546d7f99335b445576d 100644 (file)
@@ -24,9 +24,9 @@ class UnitTesting(ViewLayerTesting):
         # note: nothing should change, so using `layers_simple.json`
         filepath_layers_json_copy = os.path.join(ROOT, 'layers_simple.json')
         self.do_scene_copy(
-                filepath_layers_json_copy,
-                'LINK_OBJECTS',
-                (get_scene_collections,))
+            filepath_layers_json_copy,
+            'LINK_OBJECTS',
+            (get_scene_collections,))
 
 
 # ############################################################
index c9bb092484843dc35c90dd1fed24c8c35dcbdd0d..57c875c047cdb37b1d2d547906dd181ac27f6426 100644 (file)
@@ -23,9 +23,9 @@ class UnitTesting(ViewLayerTesting):
 
         filepath_layers_json_copy = os.path.join(ROOT, 'layers_copy_full.json')
         self.do_scene_copy(
-                filepath_layers_json_copy,
-                'FULL_COPY',
-                (get_scene_collections, get_layers))
+            filepath_layers_json_copy,
+            'FULL_COPY',
+            (get_scene_collections, get_layers))
 
 
 # ############################################################
index 6efd93c765900b75c69028034049d212a8826e23..6db3fb797e5294baacbce398ac8cc0db2b6520ca 100644 (file)
@@ -23,9 +23,9 @@ class UnitTesting(ViewLayerTesting):
 
         filepath_layers_json_copy = os.path.join(ROOT, 'layers_copy_link.json')
         self.do_scene_copy(
-                filepath_layers_json_copy,
-                'LINK_OBJECTS',
-                (get_scene_collections, get_layers))
+            filepath_layers_json_copy,
+            'LINK_OBJECTS',
+            (get_scene_collections, get_layers))
 
 
 # ############################################################
index 6c750d879876eb180e6ad6d97e6ab0302f091353..92f3395d819690d8bd44ea1c9e03194c15c006fe 100644 (file)
@@ -46,7 +46,7 @@ class UnitTesting(ViewLayerTesting):
             self.assertTrue(compare_files(
                 filepath_doversion_json,
                 filepath_layers_json,
-                ),
+            ),
                 "Run: test_scene_write_layers")
 
             if do_read:
@@ -65,7 +65,7 @@ class UnitTesting(ViewLayerTesting):
                 self.assertTrue(compare_files(
                     filepath_read_json,
                     filepath_layers_json,
-                    ),
+                ),
                     "Scene dump files differ")
 
     def test_scene_write_collections(self):
@@ -79,10 +79,10 @@ class UnitTesting(ViewLayerTesting):
         filepath_layers_json = os.path.join(ROOT, 'layers_simple.json')
 
         self.do_scene_write_read(
-                filepath_layers,
-                filepath_layers_json,
-                (get_scene_collections,),
-                False)
+            filepath_layers,
+            filepath_layers_json,
+            (get_scene_collections,),
+            False)
 
     def test_scene_write_layers(self):
         """
@@ -95,10 +95,10 @@ class UnitTesting(ViewLayerTesting):
         filepath_layers_json = os.path.join(ROOT, 'layers.json')
 
         self.do_scene_write_read(
-                filepath_layers,
-                filepath_layers_json,
-                (get_scene_collections, get_layers),
-                False)
+            filepath_layers,
+            filepath_layers_json,
+            (get_scene_collections, get_layers),
+            False)
 
     def test_scene_read_collections(self):
         """
@@ -112,10 +112,10 @@ class UnitTesting(ViewLayerTesting):
         filepath_layers_json = os.path.join(ROOT, 'layers_simple.json')
 
         self.do_scene_write_read(
-                filepath_layers,
-                filepath_layers_json,
-                (get_scene_collections,),
-                True)
+            filepath_layers,
+            filepath_layers_json,
+            (get_scene_collections,),
+            True)
 
     def test_scene_read_layers(self):
         """
@@ -129,10 +129,10 @@ class UnitTesting(ViewLayerTesting):
         filepath_layers_json = os.path.join(ROOT, 'layers.json')
 
         self.do_scene_write_read(
-                filepath_layers,
-                filepath_layers_json,
-                (get_scene_collections, get_layers),
-                True)
+            filepath_layers,
+            filepath_layers_json,
+            (get_scene_collections, get_layers),
+            True)
 
 
 # ############################################################
index 8dcc094a1c62f8d1f20ec4e2b0fa1472751b8767..25cf7c80d9645c446c65d36e34ac248af849f115 100644 (file)
@@ -157,11 +157,11 @@ def query_scene(filepath, name, callbacks):
 def dump(data):
     import json
     return json.dumps(
-            data,
-            sort_keys=True,
-            indent=4,
-            separators=(',', ': '),
-            )
+        data,
+        sort_keys=True,
+        indent=4,
+        separators=(',', ': '),
+    )
 
 
 # ############################################################
@@ -170,7 +170,7 @@ def dump(data):
 
 PDB = False
 DUMP_DIFF = True
-UPDATE_DIFF = False # HACK used to update tests when something change
+UPDATE_DIFF = False  # HACK used to update tests when something change
 
 
 def compare_files(file_a, file_b):
@@ -188,7 +188,6 @@ def compare_files(file_a, file_b):
             import subprocess
             subprocess.call(["cp", "-u", file_a, file_b])
 
-
         if PDB:
             import pdb
             print("Files differ:", file_b, file_a)
@@ -239,8 +238,8 @@ class ViewLayerTesting(unittest.TestCase):
     def path_exists(self, filepath):
         import os
         self.assertTrue(
-                os.path.exists(filepath),
-                "Test file \"{0}\" not found".format(filepath))
+            os.path.exists(filepath),
+            "Test file \"{0}\" not found".format(filepath))
 
     def do_object_add(self, filepath_json, add_mode):
         """
@@ -307,7 +306,7 @@ class ViewLayerTesting(unittest.TestCase):
             self.assertTrue(compare_files(
                 filepath_objects_json,
                 filepath_json,
-                ),
+            ),
                 "Scene dump files differ")
 
     def do_object_add_no_collection(self, add_mode):
@@ -356,7 +355,7 @@ class ViewLayerTesting(unittest.TestCase):
             (self.path_exists(f) for f in (
                 filepath_layers,
                 filepath_json_reference,
-                ))
+            ))
 
             filepath_saved = os.path.join(dirpath, '{0}.blend'.format(copy_mode))
             filepath_json = os.path.join(dirpath, "{0}.json".format(copy_mode))
@@ -376,7 +375,7 @@ class ViewLayerTesting(unittest.TestCase):
             self.assertTrue(compare_files(
                 filepath_json,
                 filepath_json_reference,
-                ),
+            ),
                 "Scene copy \"{0}\" test failed".format(copy_mode.title()))
 
     def do_object_delete(self, del_mode):
@@ -437,7 +436,7 @@ class ViewLayerTesting(unittest.TestCase):
             self.assertTrue(compare_files(
                 filepath_generated_json,
                 filepath_reference_json,
-                ),
+            ),
                 "Scene dump files differ")
 
     def do_visibility_object_add(self, add_mode):
@@ -517,23 +516,24 @@ class MoveSceneCollectionTesting(ViewLayerTesting):
     """
     To be used by tests of view_layer_move_into_scene_collection
     """
+
     def get_initial_scene_tree_map(self):
         collections_map = [
-                ['A', [
-                    ['i', None],
-                    ['ii', None],
-                    ['iii', None],
-                    ]],
-                ['B', None],
-                ['C', [
-                    ['1', None],
-                    ['2', None],
-                    ['3', [
-                        ['dog', None],
-                        ['cat', None],
-                        ]],
-                    ]],
-                ]
+            ['A', [
+                ['i', None],
+                ['ii', None],
+                ['iii', None],
+            ]],
+            ['B', None],
+            ['C', [
+                ['1', None],
+                ['2', None],
+                ['3', [
+                    ['dog', None],
+                    ['cat', None],
+                ]],
+            ]],
+        ]
         return collections_map
 
     def build_scene_tree(self, tree_map, collection=None, ret_dict=None):
@@ -565,8 +565,8 @@ class MoveSceneCollectionTesting(ViewLayerTesting):
         """
         self.cleanup_tree()
         self.assertTrue(
-                hasattr(self, "get_initial_scene_tree_map"),
-                "Test class has no get_initial_scene_tree_map method implemented")
+            hasattr(self, "get_initial_scene_tree_map"),
+            "Test class has no get_initial_scene_tree_map method implemented")
 
         return self.build_scene_tree(self.get_initial_scene_tree_map())
 
@@ -605,20 +605,21 @@ class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting):
     """
     To be used by tests of view_layer_move_into_scene_collection_sync
     """
+
     def get_initial_layers_tree_map(self):
         layers_map = [
-                ['Layer 1', [
-                    'Master Collection',
-                    'C',
-                    '3',
-                    ]],
-                ['Layer 2', [
-                    'C',
-                    '3',
-                    'dog',
-                    'cat',
-                    ]],
-                ]
+            ['Layer 1', [
+                'Master Collection',
+                'C',
+                '3',
+            ]],
+            ['Layer 2', [
+                'C',
+                '3',
+                'dog',
+                'cat',
+            ]],
+        ]
         return layers_map
 
     def get_reference_layers_tree_map(self):
@@ -634,8 +635,8 @@ class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting):
         scene = bpy.context.scene
 
         self.assertTrue(
-                hasattr(self, "get_initial_layers_tree_map"),
-                "Test class has no get_initial_layers_tree_map method implemented")
+            hasattr(self, "get_initial_layers_tree_map"),
+            "Test class has no get_initial_layers_tree_map method implemented")
 
         layers_map = self.get_initial_layers_tree_map()
 
@@ -684,6 +685,7 @@ class MoveLayerCollectionTesting(MoveSceneCollectionSyncTesting):
     """
     To be used by tests of view_layer_move_into_layer_collection
     """
+
     def parse_move(self, path, sep='.'):
         """
         convert 'Layer 1.C.2' into:
@@ -739,15 +741,15 @@ class Clay:
 
         # store the variables
         self._scene_collections = {
-                'grandma': scene_collection_grandma,
-                'mom': scene_collection_mom,
-                'kid': scene_collection_kid,
-                }
+            'grandma': scene_collection_grandma,
+            'mom': scene_collection_mom,
+            'kid': scene_collection_kid,
+        }
         self._layer_collections = {
-                'grandma': layer_collection_grandma,
-                'mom': layer_collection_mom,
-                'kid': layer_collection_kid,
-                }
+            'grandma': layer_collection_grandma,
+            'mom': layer_collection_mom,
+            'kid': layer_collection_kid,
+        }
 
         if extra_kid_layer:
             layer_collection_extra = self._layer.collections.link(scene_collection_kid)
@@ -765,7 +767,7 @@ class Clay:
         # remove all the other collections
         while self._scene.master_collection.collections:
             self._scene.master_collection.collections.remove(
-                    self._scene.master_collection.collections[0])
+                self._scene.master_collection.collections[0])
 
         layer = self._scene.view_layers.new('Evaluation Test')
         layer.collections.unlink(layer.collections[0])
@@ -790,9 +792,9 @@ class Clay:
 
         # change scene settings
         self._properties = {
-                'scene': self._scene.collection_properties[ENGINE],
-                'object': self._object.collection_properties[ENGINE],
-                }
+            'scene': self._scene.collection_properties[ENGINE],
+            'object': self._object.collection_properties[ENGINE],
+        }
 
         for key, value in self._layer_collections.items():
             self._properties[key] = self._layer_collections[key].engine_overrides[ENGINE]