[Bf-blender-cvs] [0f1000ce0b2] blender2.8: Cleanup: pep8, style

[Campbell Barton]

Commit: 0f1000ce0b296c1a6e4de3534dd3f3b51926167c
Author: Campbell Barton
Date:   Sat Jul 7 08:58:37 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0f1000ce0b296c1a6e4de3534dd3f3b51926167c

Cleanup: pep8, style

===================================================================

M	release/scripts/startup/bl_ui/space_dopesheet.py
M	release/scripts/startup/bl_ui/space_outliner.py
M	release/scripts/startup/bl_ui/space_view3d.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 92022e019cc..1b89cfd470d 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -283,7 +283,7 @@ class DOPESHEET_HT_editor_buttons(Header):
         row = layout.row(align=True)
         row.operator("action.copy", text="", icon='COPYDOWN')
         row.operator("action.paste", text="", icon='PASTEDOWN')
-        if st.mode not in ('GPENCIL', 'MASK'):
+        if st.mode not in {'GPENCIL', 'MASK'}:
             row.operator("action.paste", text="", icon='PASTEFLIPDOWN').flipped = True
 
 
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 37a5804f12c..965de6b1ce1 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -260,28 +260,31 @@ class OUTLINER_PT_filter(Panel):
 
         col = layout.column(align=True)
 
-        col.prop(space, "use_filter_collection", text="Collections", icon="GROUP")
-        col.prop(space, "use_filter_object", text="Objects", icon="OBJECT_DATAMODE")
+        col.prop(space, "use_filter_collection", text="Collections", icon='GROUP')
+        col.prop(space, "use_filter_object", text="Objects", icon='OBJECT_DATAMODE')
 
         sub = col.column(align=True)
         sub.active = space.use_filter_object
 
         if bpy.data.meshes:
-            sub.prop(space, "use_filter_object_mesh", text="Meshes", icon="MESH_DATA")
+            sub.prop(space, "use_filter_object_mesh", text="Meshes", icon='MESH_DATA')
         if bpy.data.armatures:
-            sub.prop(space, "use_filter_object_armature", text="Armatures", icon="ARMATURE_DATA")
+            sub.prop(space, "use_filter_object_armature", text="Armatures", icon='ARMATURE_DATA')
         if bpy.data.lights:
-            sub.prop(space, "use_filter_object_light", text="Lights", icon="LIGHT_DATA")
+            sub.prop(space, "use_filter_object_light", text="Lights", icon='LIGHT_DATA')
         if bpy.data.cameras:
-            sub.prop(space, "use_filter_object_camera", text="Cameras", icon="CAMERA_DATA")
-
-        sub.prop(space, "use_filter_object_empty", text="Empties", icon="EMPTY_DATA")
-
-        if bpy.data.curves or \
-           bpy.data.metaballs or \
-           bpy.data.lightprobes or \
-           bpy.data.lattices or \
-           bpy.data.fonts or bpy.data.speakers:
+            sub.prop(space, "use_filter_object_camera", text="Cameras", icon='CAMERA_DATA')
+
+        sub.prop(space, "use_filter_object_empty", text="Empties", icon='EMPTY_DATA')
+
+        if (
+                bpy.data.curves or
+                bpy.data.metaballs or
+                bpy.data.lightprobes or
+                bpy.data.lattices or
+                bpy.data.fonts or
+                bpy.data.speakers
+        ):
             sub.prop(space, "use_filter_object_others", text="Others")
 
         subsub = sub.column(align=False)
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 8a3acd033f3..b0abb1b3117 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -136,7 +136,7 @@ class VIEW3D_HT_header(Header):
                 trans_icon = getattr(trans_orientation, "icon", "BLANK1")
                 trans_name = getattr(trans_orientation, "name", "Orientation")
             else:
-                trans_icon = "VISIBLE_IPO_OFF"
+                trans_icon = 'VISIBLE_IPO_OFF'
                 trans_name = getattr(current_orientation, "name", "Orientation")
 
             row = layout.row(align=True)
@@ -3761,7 +3761,7 @@ class VIEW3D_PT_shading_color(Panel):
     def poll(cls, context):
         view = context.space_data
         shading = view.shading
-        return shading.type in ['SOLID']
+        return shading.type == 'SOLID'
 
     def draw(self, context):
         layout = self.layout