Skip to content

Commit

Permalink
general: fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
dylanaraps committed Oct 17, 2018
1 parent 580f5b7 commit 72e3c02
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pywal/backends/wal.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
11 changes: 5 additions & 6 deletions pywal/theme.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand All @@ -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)

0 comments on commit 72e3c02

Please sign in to comment.