Cleanup: pep8

2 files changed, 53 insertions, 34 deletions

diff --git a/source/blender/datatoc/datatoc_icon_split.py b/source/blender/datatoc/datatoc_icon_split.py
index aae907ec340..faf8d57be77 100755
--- a/source/blender/datatoc/datatoc_icon_split.py
+++ b/source/blender/datatoc/datatoc_icon_split.py
@@ -68,7 +68,7 @@ def image_from_file(filepath):
 
     if bpy is not None:
         pixels, pixel_w, pixel_h = image_from_file__bpy(filepath)
-    #else:
+    # else:
     #    pixels, pixel_w, pixel_h = image_from_file__py(filepath)
 
     return pixels, pixel_w, pixel_h
@@ -95,12 +95,14 @@ def write_subimage(sub_x, sub_y, sub_w, sub_h,
 
     with open(filepath, 'wb') as f:
 
-        f.write(struct.pack('<6I',
+        f.write(
+            struct.pack(
+                '<6I',
                 sub_w, sub_h,
                 sub_x, sub_y,
                 # redundant but including to maintain consistency
-                pixel_w, pixel_h,
-                ))
+                            pixel_w, pixel_h,
+            ))
 
         for y in range(sub_h):
             for x in range(sub_w):
@@ -113,8 +115,9 @@ def write_subimage(sub_x, sub_y, sub_w, sub_h,
 _dice_icon_name_cache = {}
 
 
-def dice_icon_name(x, y, parts_x, parts_y,
-                   name_style=None, prefix=""):
+def dice_icon_name(
+        x, y, parts_x, parts_y,
+        name_style=None, prefix=""):
     """
     How to name icons, this is mainly for what name we get in git,
     the actual names don't really matter, its just nice to have the
@@ -143,7 +146,7 @@ def dice_icon_name(x, y, parts_x, parts_y,
         icon_name = _dice_icon_name_cache[index]
 
         # for debugging its handy to sort by number
-        #~ id_str = "%03d_%s%s.dat" % (index, prefix, icon_name)
+        # ~ id_str = "%03d_%s%s.dat" % (index, prefix, icon_name)
 
         id_str = "%s%s.dat" % (prefix, icon_name)
 
@@ -158,16 +161,18 @@ def dice_icon_name(x, y, parts_x, parts_y,
     return id_str
 
 
-def dice(filepath, output, output_prefix, name_style,
-         parts_x, parts_y,
-         minx, miny, maxx, maxy,
-         minx_icon, miny_icon, maxx_icon, maxy_icon,
-         spacex_icon, spacey_icon,
-         ):
+def dice(
+        filepath, output, output_prefix, name_style,
+        parts_x, parts_y,
+        minx, miny, maxx, maxy,
+        minx_icon, miny_icon, maxx_icon, maxy_icon,
+        spacex_icon, spacey_icon,
+):
 
-    is_simple = (max(minx, miny, maxx, maxy,
-                     minx_icon, miny_icon, maxx_icon, maxy_icon,
-                     spacex_icon, spacey_icon) == 0)
+    is_simple = (max(
+        minx, miny, maxx, maxy,
+        minx_icon, miny_icon, maxx_icon, maxy_icon,
+        spacex_icon, spacey_icon) == 0)
 
     pixels, pixel_w, pixel_h = image_from_file(filepath)
 
@@ -199,9 +204,11 @@ def dice(filepath, output, output_prefix, name_style,
 
     for x in range(parts_x):
         for y in range(parts_y):
-            id_str = dice_icon_name(x, y,
-                                    parts_x, parts_y,
-                                    name_style=name_style, prefix=output_prefix)
+            id_str = dice_icon_name(
+                x, y,
+                parts_x, parts_y,
+                name_style=name_style, prefix=output_prefix
+            )
             filepath = os.path.join(output, id_str)
             if VERBOSE:
                 print("  writing:", filepath)
@@ -235,25 +242,35 @@ def main():
     parser = argparse.ArgumentParser(description=__doc__, epilog=epilog)
 
     # File path options
-    parser.add_argument("--image", dest="image", metavar='FILE',
-            help="Image file")
-
-    parser.add_argument("--output", dest="output", metavar='DIR',
-            help="Output directory")
-
-    parser.add_argument("--output_prefix", dest="output_prefix", metavar='STRING',
-            help="Output prefix")
+    parser.add_argument(
+        "--image", dest="image", metavar='FILE',
+        help="Image file",
+    )
+    parser.add_argument(
+        "--output", dest="output", metavar='DIR',
+        help="Output directory",
+    )
+    parser.add_argument(
+        "--output_prefix", dest="output_prefix", metavar='STRING',
+        help="Output prefix",
+    )
 
     # Icon naming option
-    parser.add_argument("--name_style", dest="name_style", metavar='ENUM', type=str,
-            choices=('', 'UI_ICONS'),
-            help="The metod used for naming output data")
+    parser.add_argument(
+        "--name_style", dest="name_style", metavar='ENUM', type=str,
+        choices=('', 'UI_ICONS'),
+        help="The metod used for naming output data",
+    )
 
     # Options for dicing up the image
-    parser.add_argument("--parts_x", dest="parts_x", metavar='INT', type=int,
-            help="Grid X parts")
-    parser.add_argument("--parts_y", dest="parts_y", metavar='INT', type=int,
-            help="Grid Y parts")
+    parser.add_argument(
+        "--parts_x", dest="parts_x", metavar='INT', type=int,
+        help="Grid X parts",
+    )
+    parser.add_argument(
+        "--parts_y", dest="parts_y", metavar='INT', type=int,
+        help="Grid Y parts",
+    )
 
     _help = "Inset from the outer edge (in pixels)"
     parser.add_argument("--minx", dest="minx", metavar='INT', type=int, help=_help)
@@ -287,5 +304,6 @@ def main():
          args.spacex_icon, args.spacey_icon,
          )
 
+
 if __name__ == "__main__":
     main()
diff --git a/source/blender/datatoc/datatoc_icon_split_to_png.py b/source/blender/datatoc/datatoc_icon_split_to_png.py
index 39bbf1110fb..b583b10b9ff 100755
--- a/source/blender/datatoc/datatoc_icon_split_to_png.py
+++ b/source/blender/datatoc/datatoc_icon_split_to_png.py
@@ -67,5 +67,6 @@ def main():
 
         icondata_to_png(file_src, file_dst)
 
+
 if __name__ == "__main__":
     main()