general: fix lint

This commit is contained in:
Dylan Araps 2018-10-17 15:20:01 +11:00
parent 580f5b76be
commit 72e3c02a2b
3 changed files with 7 additions and 8 deletions

View file

@ -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

View file

@ -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.")

View file

@ -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)