From f391a4fcb262085f8fb03cfc77fcd2600415b40c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 19 Jun 2017 19:55:55 +1000 Subject: [PATCH] General: Cleanup --- wal.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/wal.py b/wal.py index 5412f60..a80eb6b 100755 --- a/wal.py +++ b/wal.py @@ -109,11 +109,7 @@ def process_colors(args): # Import the colorscheme from file. if cache_file.is_file(): - with open(cache_file) as file: - colors = file.readlines() - - # Strip newlines from each list element. - colors = [x.strip() for x in colors] + colors = read_colors(cache_file) if len(colors) < 16: print("error: Invalid colorscheme file chosen.") @@ -125,6 +121,17 @@ def process_colors(args): return colors +def read_colors(color_file): + """Read colors from a file""" + with open(color_file) as file: + colors = file.readlines() + + # Strip newlines from each list element. + colors = [x.strip() for x in colors] + + return colors + + # }}} @@ -222,11 +229,8 @@ def get_colors(img): file.write("%s\n" % (img)) if cache_file.is_file(): - with open(cache_file) as file: - colors = file.readlines() + colors = read_colors(cache_file) - # Strip newlines from each list element. - colors = [x.strip() for x in colors] else: print("colors: Generating a colorscheme...")