[Bf-blender-cvs] [646f8bdb480] blender2.8: Cleanup: pep8
Campbell Barton
noreply at git.blender.org
Tue Jul 3 07:13:49 CEST 2018
Commit: 646f8bdb4801b0376b3e4bd01bbac49a51c99940
Author: Campbell Barton
Date: Tue Jul 3 07:12:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB646f8bdb4801b0376b3e4bd01bbac49a51c99940
Cleanup: pep8
===================================================================
M tests/python/eevee_render_tests.py
M tests/python/view_layer/test_active_collection.py
M tests/python/view_layer/test_collection_new_sync.py
M tests/python/view_layer/test_group_d.py
M tests/python/view_layer/test_layer_linking.py
M tests/python/view_layer/test_layer_syncing.py
M tests/python/view_layer/test_make_single_user.py
M tests/python/view_layer/test_move_above_below_layer_collection_f.py
M tests/python/view_layer/test_move_above_below_layer_collection_g.py
M tests/python/view_layer/test_move_above_below_layer_collection_i.py
M tests/python/view_layer/test_move_above_below_layer_collection_l.py
M tests/python/view_layer/test_move_above_below_scene_collection_a.py
M tests/python/view_layer/test_move_above_below_scene_collection_b.py
M tests/python/view_layer/test_move_above_below_scene_collection_c.py
M tests/python/view_layer/test_move_above_below_scene_collection_d.py
M tests/python/view_layer/test_move_above_below_scene_collection_e.py
M tests/python/view_layer/test_move_above_below_scene_collection_f.py
M tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py
M tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py
M tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py
M tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py
M tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py
M tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py
M tests/python/view_layer/test_move_into_layer_collection_a.py
M tests/python/view_layer/test_move_into_layer_collection_f.py
M tests/python/view_layer/test_move_into_layer_collection_g.py
M tests/python/view_layer/test_move_into_layer_collection_h.py
M tests/python/view_layer/test_move_into_scene_collection_a.py
M tests/python/view_layer/test_move_into_scene_collection_b.py
M tests/python/view_layer/test_move_into_scene_collection_c.py
M tests/python/view_layer/test_move_into_scene_collection_e.py
M tests/python/view_layer/test_move_into_scene_collection_f.py
M tests/python/view_layer/test_move_into_scene_collection_g.py
M tests/python/view_layer/test_move_into_scene_collection_h.py
M tests/python/view_layer/test_move_into_scene_collection_i.py
M tests/python/view_layer/test_move_into_scene_collection_sync_b.py
M tests/python/view_layer/test_move_into_scene_collection_sync_c.py
M tests/python/view_layer/test_move_into_scene_collection_sync_e.py
M tests/python/view_layer/test_move_into_scene_collection_sync_f.py
M tests/python/view_layer/test_move_into_scene_collection_sync_g.py
M tests/python/view_layer/test_move_into_scene_collection_sync_h.py
M tests/python/view_layer/test_move_into_scene_collection_sync_i.py
M tests/python/view_layer/test_object_copy.py
M tests/python/view_layer/test_operator_context.py
M tests/python/view_layer/test_scene_copy_a.py
M tests/python/view_layer/test_scene_copy_b.py
M tests/python/view_layer/test_scene_copy_c.py
M tests/python/view_layer/test_scene_copy_d.py
M tests/python/view_layer/test_scene_write_read.py
M tests/python/view_layer/view_layer_common.py
===================================================================
diff --git a/tests/python/eevee_render_tests.py b/tests/python/eevee_render_tests.py
index 74e716dc8e6..48751e6bbcb 100755
--- a/tests/python/eevee_render_tests.py
+++ b/tests/python/eevee_render_tests.py
@@ -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
diff --git a/tests/python/view_layer/test_active_collection.py b/tests/python/view_layer/test_active_collection.py
index 10df71f77ce..1c6c3cd1983 100644
--- a/tests/python/view_layer/test_active_collection.py
+++ b/tests/python/view_layer/test_active_collection.py
@@ -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))
# ############################################################
diff --git a/tests/python/view_layer/test_collection_new_sync.py b/tests/python/view_layer/test_collection_new_sync.py
index 582e6c13d89..46b63c64f45 100644
--- a/tests/python/view_layer/test_collection_new_sync.py
+++ b/tests/python/view_layer/test_collection_new_sync.py
@@ -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'})
# ############################################################
diff --git a/tests/python/view_layer/test_group_d.py b/tests/python/view_layer/test_group_d.py
index 6f54ca5340a..709d27df184 100644
--- a/tests/python/view_layer/test_group_d.py
+++ b/tests/python/view_layer/test_group_d.py
@@ -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:
diff --git a/tests/python/view_layer/test_layer_linking.py b/tests/python/view_layer/test_layer_linking.py
index 4c66c564d7c..43c88aa65f9 100644
--- a/tests/python/view_layer/test_layer_linking.py
+++ b/tests/python/view_layer/test_layer_linking.py
@@ -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):
diff --git a/tests/python/view_layer/test_layer_syncing.py b/tests/python/view_layer/test_layer_syncing.py
index d8175c4850f..9baf25f9e9e 100644
--- a/tests/python/view_layer/test_layer_syncing.py
+++ b/tests/python/view_layer/test_layer_syncing.py
@@ -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):
diff --git a/tests/python/view_layer/test_make_single_user.py b/tests/python/view_layer/test_make_single_user.py
index 2a8a479bab2..292c2d50605 100644
--- a/tests/python/view_layer/test_make_single_user.py
+++ b/tests/python/view_layer/test_make_single_user.py
@@ -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')
diff --git a/tests/python/view_layer/test_move_above_below_layer_collection_f.py b/tests/python/view_layer/test_move_above_below_layer_collection_f.py
index 77d65ef8671..036486bf55a 100644
--- a/tests/python/view_layer/test_move_above_below_layer_collection_f.py
+++ b/tests/python/view_layer/test_move_above_below_layer_collection_f.py
@@ -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):
diff --git a/tests/python/view_layer/test_move_above_below_layer_collection_g.py b/tests/python/view_layer/test_move_above_below_layer_collection_g.py
index 16cd628edfc..aca6c5d5ff6 100644
--- a/tests/python/view_layer/test_move_above_below_layer_collection_g.py
+++ b/tests/python/view_layer/test_move_above_below_layer_collection_g.py
@@ -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):
diff --git a/tests/python/view_layer/test_move_above_below_layer_collection_i.py b/tests/python/view_layer/test_move_above_below_layer_collection_i.py
index 0134d11adcd..dada882a412 100644
--- a/tests/python/view_layer/test_move_above_below_layer_collection_i.py
+++ b/tests/python/view_layer/test_move_above_below_layer_collection_i.py
@@ -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):
diff --git a/tests/python/view_layer/test_move_above_below_layer_collection_l.py b
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list