From 42426f816bafae5d863f16dcb05135dfa773e387 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 4 Sep 2012 20:31:19 +0000
Subject: [PATCH] code cleanup: python - pass multiple args to string
startswith() / endswith() functions rather than calling multiple times.
---
io_import_gimp_image_to_scene.py | 2 +-
io_scene_obj/import_obj.py | 6 +++---
netrender/master_html.py | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/io_import_gimp_image_to_scene.py b/io_import_gimp_image_to_scene.py
index 4605fe1d9..bc09c75f9 100644
--- a/io_import_gimp_image_to_scene.py
+++ b/io_import_gimp_image_to_scene.py
@@ -85,7 +85,7 @@ def main(File, Path, LayerViewers, MixerViewers, LayerOffset,
for Segment in Line.split():
if Segment.startswith('w/h:'):
ResX, ResY = map (int, Segment[4:].split(','))
- if Line.startswith("b'L") or Line.startswith("b'l"):
+ if Line.startswith(("b'L", "b'l")):
"""The "nice" method to check if layer has alpha channel
sadly GIMP sometimes decides not to export an alpha channel
diff --git a/io_scene_obj/import_obj.py b/io_scene_obj/import_obj.py
index 2ce97ec08..11fa543ff 100644
--- a/io_scene_obj/import_obj.py
+++ b/io_scene_obj/import_obj.py
@@ -212,7 +212,7 @@ def create_materials(filepath, material_libs, unique_materials, unique_material_
context_material.specular_hardness = int((float(line_split[1]) * 0.51))
elif line_lower.startswith(b'ni'): # Refraction index
context_material.raytrace_transparency.ior = max(1, min(float(line_split[1]), 3)) # between 1 and 3
- elif line_lower.startswith(b'd') or line_lower.startswith(b'tr'):
+ elif line_lower.startswith((b'd', b'tr')):
context_material.alpha = float(line_split[1])
context_material.use_transparency = True
context_material.transparency_method = 'Z_TRANSPARENCY'
@@ -330,11 +330,11 @@ def create_materials(filepath, material_libs, unique_materials, unique_material_
img_filepath = line_value(line.split())
if img_filepath:
load_material_image(context_material, context_material_name, img_filepath, 'Kd')
- elif line_lower.startswith(b'map_bump') or line_lower.startswith(b'bump'): # 'bump' is incorrect but some files use it.
+ elif line_lower.startswith((b'map_bump', b'bump')): # 'bump' is incorrect but some files use it.
img_filepath = line_value(line.split())
if img_filepath:
load_material_image(context_material, context_material_name, img_filepath, 'Bump')
- elif line_lower.startswith(b'map_d') or line_lower.startswith(b'map_tr'): # Alpha map - Dissolve
+ elif line_lower.startswith((b'map_d', b'map_tr')): # Alpha map - Dissolve
img_filepath = line_value(line.split())
if img_filepath:
load_material_image(context_material, context_material_name, img_filepath, 'D')
diff --git a/netrender/master_html.py b/netrender/master_html.py
index 8ee0fe4ff..e358c7e29 100644
--- a/netrender/master_html.py
+++ b/netrender/master_html.py
@@ -41,7 +41,7 @@ def countFiles(job):
for file in job.files:
if file.filepath.endswith(".bphys"):
tot_cache += 1
- elif file.filepath.endswith(".bobj.gz") or file.filepath.endswith(".bvel.gz"):
+ elif file.filepath.endswith((".bobj.gz", ".bvel.gz")):
tot_fluid += 1
elif not file == job.files[0]:
tot_other += 1
@@ -166,10 +166,10 @@ def get(handler):
if file.filepath.endswith(".bphys") and (file_type & CACHE_FILES):
message.append(filedata);
continue
- if (file.filepath.endswith(".bobj.gz") or file.filepath.endswith(".bvel.gz")) and (file_type & FLUID_FILES):
+ if file.filepath.endswith((".bobj.gz", ".bvel.gz")) and (file_type & FLUID_FILES):
message.append(filedata);
continue
- if (not file == job.files[0]) and (file_type & OTHER_FILES) and ( not (file.filepath.endswith(".bobj.gz") or file.filepath.endswith(".bvel.gz"))) and not file.filepath.endswith(".bphys"):
+ if (not file == job.files[0]) and (file_type & OTHER_FILES) and (not file.filepath.endswith((".bobj.gz", ".bvel.gz"))) and not file.filepath.endswith(".bphys"):
message.append(filedata);
continue
@@ -470,7 +470,7 @@ def get(handler):
if tot_fluid > 0:
rowTable("%i fluid bake files" % tot_fluid, class_style = "toggle", extra = "onclick='toggleDisplay(".fluid", "none", "table-row")'")
for file in job.files:
- if file.filepath.endswith(".bobj.gz") or file.filepath.endswith(".bvel.gz"):
+ if file.filepath.endswith((".bobj.gz", ".bvel.gz")):
rowTable(os.path.split(file.filepath)[1], class_style = "fluid")
if tot_other > 0:
@@ -478,7 +478,7 @@ def get(handler):
for file in job.files:
if (
not file.filepath.endswith(".bphys")
- and not file.filepath.endswith(".bobj.gz") or file.filepath.endswith(".bvel.gz")
+ and not file.filepath.endswith((".bobj.gz", ".bvel.gz"))
and not file == job.files[0]
):
--
GitLab