pep8 cleanup
authorCampbell Barton <ideasman42@gmail.com>
Fri, 25 Feb 2011 16:06:14 +0000 (16:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 25 Feb 2011 16:06:14 +0000 (16:06 +0000)
release/scripts/modules/add_object_utils.py
release/scripts/modules/addon_utils.py
release/scripts/modules/bpy/utils.py
release/scripts/ui/properties_material.py
release/scripts/ui/space_image.py

index 128b98b9aeaa07e1858c433c15fc9b28b408053e..1cf7fc2f4d50e06e27eb3b5c5ea2c54b1d7e9322 100644 (file)
@@ -82,7 +82,7 @@ def object_data_add(context, obdata, operator=None):
     obj_new.matrix_world = add_object_align_init(context, operator)
 
     obj_act = scene.objects.active
-    
+
     # XXX
     # caused because entering editmodedoes not add a empty undo slot!
     if context.user_preferences.edit.use_enter_edit_mode:
index 1c96d124a961f2a8a5e212fb10ce926a24b4014c..d2001087f13046b2bea2a9a11236f5716d97bc1f 100644 (file)
 # <pep8 compliant>
 
 __all__ = (
-       "paths",
-       "modules",
-       "check",
-       "enable",
-       "disable",
-       "reset_all",
-       "module_bl_info",
+    "paths",
+    "modules",
+    "check",
+    "enable",
+    "disable",
+    "reset_all",
+    "module_bl_info",
 )
 
 import bpy as _bpy
 
 
 def paths():
-       # RELEASE SCRIPTS: official scripts distributed in Blender releases
-       paths = _bpy.utils.script_paths("addons")
+    # RELEASE SCRIPTS: official scripts distributed in Blender releases
+    paths = _bpy.utils.script_paths("addons")
+
+    # CONTRIB SCRIPTS: good for testing but not official scripts yet
+    # if folder addons_contrib/ exists, scripts in there will be loaded too
+    paths += _bpy.utils.script_paths("addons_contrib")
 
-       # CONTRIB SCRIPTS: good for testing but not official scripts yet
-       # if folder addons_contrib/ exists, scripts in there will be loaded too
-       paths += _bpy.utils.script_paths("addons_contrib")
+    # EXTERN SCRIPTS: external projects scripts
+    # if folder addons_extern/ exists, scripts in there will be loaded too
+    paths += _bpy.utils.script_paths("addons_extern")
 
-       # EXTERN SCRIPTS: external projects scripts
-       # if folder addons_extern/ exists, scripts in there will be loaded too
-       paths += _bpy.utils.script_paths("addons_extern")
-       
-       return paths
+    return paths
 
 
 def modules(module_cache):
-       import os
-       import sys
-       import time
-
-       path_list = paths()
-
-       # fake module importing
-       def fake_module(mod_name, mod_path, speedy=True):
-               if _bpy.app.debug:
-                       print("fake_module", mod_path, mod_name)
-               import ast
-               ModuleType = type(ast)
-               file_mod = open(mod_path, "r", encoding='UTF-8')
-               if speedy:
-                       lines = []
-                       line_iter = iter(file_mod)
-                       l = ""
-                       while not l.startswith("bl_info"):
-                               l = line_iter.readline()
-                               if len(l) == 0:
-                                       break
-                       while l.rstrip():
-                               lines.append(l)
-                               l = line_iter.readline()
-                       data = "".join(lines)
-
-               else:
-                       data = file_mod.read()
-
-               file_mod.close()
-
-               try:
-                       ast_data = ast.parse(data, filename=mod_path)
-               except:
-                       print("Syntax error 'ast.parse' can't read %r" % mod_path)
-                       import traceback
-                       traceback.print_exc()
-                       ast_data = None
-
-               body_info = None
-
-               if ast_data:
-                       for body in ast_data.body:
-                               if body.__class__ == ast.Assign:
-                                       if len(body.targets) == 1:
-                                               if getattr(body.targets[0], "id", "") == "bl_info":
-                                                       body_info = body
-                                                       break
-
-               if body_info:
-                       mod = ModuleType(mod_name)
-                       mod.bl_info = ast.literal_eval(body.value)
-                       mod.__file__ = mod_path
-                       mod.__time__ = os.path.getmtime(mod_path)
-                       return mod
-               else:
-                       return None
-
-       modules_stale = set(module_cache.keys())
-
-       for path in path_list:
-               for mod_name, mod_path in _bpy.path.module_names(path):
-                       modules_stale -= {mod_name}
-                       mod = module_cache.get(mod_name)
-                       if mod:
-                               if mod.__time__ != os.path.getmtime(mod_path):
-                                       print("reloading addon:", mod_name, mod.__time__, os.path.getmtime(mod_path), mod_path)
-                                       del module_cache[mod_name]
-                                       mod = None
-
-                       if mod is None:
-                               mod = fake_module(mod_name, mod_path)
-                               if mod:
-                                       module_cache[mod_name] = mod
-
-       # just incase we get stale modules, not likely
-       for mod_stale in modules_stale:
-               del module_cache[mod_stale]
-       del modules_stale
-
-       mod_list = list(module_cache.values())
-       mod_list.sort(key=lambda mod: (mod.bl_info['category'], mod.bl_info['name']))
-       return mod_list
+    import os
+    import sys
+    import time
+
+    path_list = paths()
+
+    # fake module importing
+    def fake_module(mod_name, mod_path, speedy=True):
+        if _bpy.app.debug:
+            print("fake_module", mod_path, mod_name)
+        import ast
+        ModuleType = type(ast)
+        file_mod = open(mod_path, "r", encoding='UTF-8')
+        if speedy:
+            lines = []
+            line_iter = iter(file_mod)
+            l = ""
+            while not l.startswith("bl_info"):
+                l = line_iter.readline()
+                if len(l) == 0:
+                    break
+            while l.rstrip():
+                lines.append(l)
+                l = line_iter.readline()
+            data = "".join(lines)
+
+        else:
+            data = file_mod.read()
+
+        file_mod.close()
+
+        try:
+            ast_data = ast.parse(data, filename=mod_path)
+        except:
+            print("Syntax error 'ast.parse' can't read %r" % mod_path)
+            import traceback
+            traceback.print_exc()
+            ast_data = None
+
+        body_info = None
+
+        if ast_data:
+            for body in ast_data.body:
+                if body.__class__ == ast.Assign:
+                    if len(body.targets) == 1:
+                        if getattr(body.targets[0], "id", "") == "bl_info":
+                            body_info = body
+                            break
+
+        if body_info:
+            mod = ModuleType(mod_name)
+            mod.bl_info = ast.literal_eval(body.value)
+            mod.__file__ = mod_path
+            mod.__time__ = os.path.getmtime(mod_path)
+            return mod
+        else:
+            return None
+
+    modules_stale = set(module_cache.keys())
+
+    for path in path_list:
+        for mod_name, mod_path in _bpy.path.module_names(path):
+            modules_stale -= {mod_name}
+            mod = module_cache.get(mod_name)
+            if mod:
+                if mod.__time__ != os.path.getmtime(mod_path):
+                    print("reloading addon:", mod_name, mod.__time__, os.path.getmtime(mod_path), mod_path)
+                    del module_cache[mod_name]
+                    mod = None
+
+            if mod is None:
+                mod = fake_module(mod_name, mod_path)
+                if mod:
+                    module_cache[mod_name] = mod
+
+    # just incase we get stale modules, not likely
+    for mod_stale in modules_stale:
+        del module_cache[mod_stale]
+    del modules_stale
+
+    mod_list = list(module_cache.values())
+    mod_list.sort(key=lambda mod: (mod.bl_info['category'], mod.bl_info['name']))
+    return mod_list
 
 
 def check(module_name):
index c179134ea3474ac59ad94174a4a359a1a48fbc63..76278ca8fa193cb6a40828c601223668f6355a50 100644 (file)
@@ -36,6 +36,7 @@ import sys as _sys
 
 import addon_utils
 
+
 def _test_import(module_name, loaded_modules):
     import traceback
     import time
index 8ba2d4181d4e78b6a2671bca326da65163b83455..272862c318763d37adfc65c2dad7d1d67eb48a65 100644 (file)
@@ -361,10 +361,10 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, bpy.types.Panel):
         mat = context.material
         engine = context.scene.render.engine
         return check_material(mat) and (mat.type in ('SURFACE', 'WIRE')) and (engine in cls.COMPAT_ENGINES)
-    
+
     def draw_header(self, context):
         mat = context.material
-        
+
         if simple_material(mat):
             self.layout.prop(mat, "use_transparency", text="")
 
@@ -374,14 +374,14 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, bpy.types.Panel):
         base_mat = context.material
         mat = active_node_mat(context.material)
         rayt = mat.raytrace_transparency
-        
+
         if simple_material(base_mat):
             row = layout.row()
             row.active = mat.use_transparency
             row.prop(mat, "transparency_method", expand=True)
 
         split = layout.split()
-        
+
         col = split.column()
         col.prop(mat, "alpha")
         row = col.row()
@@ -698,7 +698,7 @@ class MATERIAL_PT_options(MaterialButtonsPanel, bpy.types.Panel):
 
     def draw(self, context):
         layout = self.layout
-        
+
         base_mat = context.material
         mat = active_node_mat(base_mat)
 
@@ -746,7 +746,7 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel, bpy.types.Panel):
 
     def draw(self, context):
         layout = self.layout
-        
+
         base_mat = context.material
         mat = active_node_mat(base_mat)
 
@@ -800,7 +800,7 @@ class MATERIAL_PT_transp_game(MaterialButtonsPanel, bpy.types.Panel):
             row = layout.row()
             row.active = mat.use_transparency
             row.prop(mat, "transparency_method", expand=True)
-            
+
         layout.prop(mat, "alpha")
 
 
@@ -897,7 +897,7 @@ class MATERIAL_PT_volume_lighting(VolumeButtonsPanel, bpy.types.Panel):
 class MATERIAL_PT_volume_transp(VolumeButtonsPanel, bpy.types.Panel):
     bl_label = "Transparency"
     COMPAT_ENGINES = {'BLENDER_RENDER'}
-    
+
     @classmethod
     def poll(cls, context):
         mat = context.material
index 8220508d4aaa6a6f61e7207c5c76771d3f4ec424..c0ef692a2d026774c03f924cbd4a3528e8b2cfa5 100644 (file)
@@ -157,24 +157,24 @@ class IMAGE_MT_image_invert(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        op = layout.operator("image.invert", text="Invert Image Colors");
-        op.invert_r = True;
-        op.invert_g = True;
-        op.invert_b = True;
+        op = layout.operator("image.invert", text="Invert Image Colors")
+        op.invert_r = True
+        op.invert_g = True
+        op.invert_b = True
 
         layout.separator()
 
-        op = layout.operator("image.invert", text="Invert Red Channel");
-        op.invert_r = True;
+        op = layout.operator("image.invert", text="Invert Red Channel")
+        op.invert_r = True
 
-        op = layout.operator("image.invert", text="Invert Green Channel");
-        op.invert_g = True;
+        op = layout.operator("image.invert", text="Invert Green Channel")
+        op.invert_g = True
 
-        op = layout.operator("image.invert", text="Invert Blue Channel");
-        op.invert_b = True;
+        op = layout.operator("image.invert", text="Invert Blue Channel")
+        op.invert_b = True
 
-        op = layout.operator("image.invert", text="Invert Alpha Channel");
-        op.invert_a = True;
+        op = layout.operator("image.invert", text="Invert Alpha Channel")
+        op.invert_a = True
 
 
 class IMAGE_MT_uvs_showhide(bpy.types.Menu):