From dba5ef3ba88d06c1927872bf4b97e22d0e750546 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 4 Sep 2012 20:26:42 +0000 Subject: [PATCH] code cleanup: python - pass multiple args to string startswith() / endswith() functions rather than calling multiple times. --- release/scripts/modules/addon_utils.py | 2 +- source/blender/makesrna/rna_cleanup/rna_cleaner.py | 2 +- source/tests/pep8.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index 433d9024e0a..485b4829b71 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -148,7 +148,7 @@ def modules(module_cache): for path in path_list: # force all contrib addons to be 'TESTING' - if path.endswith("addons_contrib") or path.endswith("addons_extern"): + if path.endswith(("addons_contrib", "addons_extern")): force_support = 'TESTING' else: force_support = None diff --git a/source/blender/makesrna/rna_cleanup/rna_cleaner.py b/source/blender/makesrna/rna_cleanup/rna_cleaner.py index b75d177d809..e3359fbae59 100755 --- a/source/blender/makesrna/rna_cleanup/rna_cleaner.py +++ b/source/blender/makesrna/rna_cleanup/rna_cleaner.py @@ -60,7 +60,7 @@ def check_commandline(): usage() if sys.argv[1] == '-h': help() - elif not (sys.argv[1].endswith(".txt") or sys.argv[1].endswith(".py")): + elif not sys.argv[1].endswith((".txt", ".py")): print ('\nBad input file extension... exiting.') usage() else: diff --git a/source/tests/pep8.py b/source/tests/pep8.py index d12397ea81d..ccaaeb7c0cd 100644 --- a/source/tests/pep8.py +++ b/source/tests/pep8.py @@ -43,7 +43,7 @@ FORCE_PEP8_ALL = False def file_list_py(path): for dirpath, dirnames, filenames in os.walk(path): for filename in filenames: - if filename.endswith(".py") or filename.endswith(".cfg"): + if filename.endswith((".py", ".cfg")): yield os.path.join(dirpath, filename)