From 72e3c02a2b40f7d232688cce007a4161a10e54ab Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Wed, 17 Oct 2018 15:20:01 +1100
Subject: [PATCH] general: fix lint

---
 .pylintrc             |  2 +-
 pywal/backends/wal.py |  2 +-
 pywal/theme.py        | 11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index ae5b20d..97a4ac1 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -10,7 +10,7 @@ good-names=i,j,k,n,x,y,fg,bg,r,g,b,i3,r1,r2,r3,g1,g2,g3,b1,b2,b3,h,s,v,l
 # too-many-statements:
 #   Disabled as it's a non-issue and only occurs in the
 #   process_args() function.
-disable=inconsistent-return-statements,too-many-branches,too-many-statements
+disable=inconsistent-return-statements,too-many-branches,too-many-statements,too-many-return-statements
 
 [SIMILARITIES]
 ignore-imports=y
diff --git a/pywal/backends/wal.py b/pywal/backends/wal.py
index 1a85e17..a75fdc5 100644
--- a/pywal/backends/wal.py
+++ b/pywal/backends/wal.py
@@ -24,7 +24,7 @@ def has_im():
     if shutil.which("magick"):
         return ["magick", "convert"]
 
-    elif shutil.which("convert"):
+    if shutil.which("convert"):
         return ["convert"]
 
     logging.error("Imagemagick wasn't found on your system.")
diff --git a/pywal/theme.py b/pywal/theme.py
index 37936c5..fcd1dd1 100644
--- a/pywal/theme.py
+++ b/pywal/theme.py
@@ -100,7 +100,7 @@ def file(input_file, light=False):
     theme_file = os.path.join(MODULE_DIR, "colorschemes", bri, theme_name)
 
     # Find the theme file.
-    if input_file == "random" or input_file == "random_dark":
+    if input_file in ("random", "random_dark"):
         theme_file = get_random_theme()
 
     elif input_file == "random_light":
@@ -118,8 +118,7 @@ def file(input_file, light=False):
                      os.path.basename(theme_file))
         return parse(theme_file)
 
-    else:
-        logging.error("No %s colorscheme file found.", bri)
-        logging.error("Try adding   '-l' to set light themes.")
-        logging.error("Try removing '-l' to set dark themes.")
-        sys.exit(1)
+    logging.error("No %s colorscheme file found.", bri)
+    logging.error("Try adding   '-l' to set light themes.")
+    logging.error("Try removing '-l' to set dark themes.")
+    sys.exit(1)