diff --git a/fishy/engine/semifisher/engine.py b/fishy/engine/semifisher/engine.py index 29ee8f7..e42e9a0 100644 --- a/fishy/engine/semifisher/engine.py +++ b/fishy/engine/semifisher/engine.py @@ -62,7 +62,8 @@ class SemiFisherEngine(IEngine): def _wait_and_check(self): time.sleep(10) if not FishEvent.FishingStarted and self.start: - logging.warning("Doesn't look like fishing has started \nCheck out #read-me-first on our discord channel to troubleshoot the issue") + logging.warning("Doesn't look like fishing has started \n" + "Check out #read-me-first on our discord channel to troubleshoot the issue") def show_pixel_vals(self): def show(): diff --git a/fishy/gui/update_dialog.py b/fishy/gui/update_dialog.py index 9e16ac9..4d881d4 100644 --- a/fishy/gui/update_dialog.py +++ b/fishy/gui/update_dialog.py @@ -9,7 +9,8 @@ def show(currentversion, newversion, returns): top.title("A wild fishy update appeared!") top.iconbitmap(helper.manifest_file('icon.ico')) - dialogLabel = tk.Label(top, text="There is a new fishy update available (" + currentversion + "->" + newversion + "). Do you want to update now?") + dialogLabel = tk.Label(top, text="There is a new fishy update available (" + + currentversion + "->" + newversion + "). Do you want to update now?") dialogLabel.grid(row=0, columnspan=2, padx=5, pady=5) cbVar = tk.IntVar() @@ -27,9 +28,11 @@ def show(currentversion, newversion, returns): top.destroy() pixelVirtual = tk.PhotoImage(width=1, height=1) # trick to use buttonWidth as pixels, not #symbols - dialogBtnNo = tk.Button(top, text="No " + str(chr(10005)), fg='red4', command=_clickNo, image=pixelVirtual, width=buttonWidth, compound="c") + dialogBtnNo = tk.Button(top, text="No " + str(chr(10005)), fg='red4', command=_clickNo, image=pixelVirtual, + width=buttonWidth, compound="c") dialogBtnNo.grid(row=2, column=0, padx=5, pady=5) - dialogBtnYes = tk.Button(top, text="Yes " + str(chr(10003)), fg='green', command=_clickYes, image=pixelVirtual, width=buttonWidth, compound="c") + dialogBtnYes = tk.Button(top, text="Yes " + str(chr(10003)), fg='green', command=_clickYes, image=pixelVirtual, + width=buttonWidth, compound="c") dialogBtnYes.grid(row=2, column=1, padx=5, pady=5) dialogBtnYes.focus_set() diff --git a/fishy/helper/helper.py b/fishy/helper/helper.py index 95ba88b..e085ca9 100644 --- a/fishy/helper/helper.py +++ b/fishy/helper/helper.py @@ -194,7 +194,8 @@ def install_addon(name, url, v=None): r = requests.get(url, stream=True) z = ZipFile(BytesIO(r.content)) z.extractall(path=get_addondir()) - logging.info("Add-On " + name + " installed successfully!\nPlease make sure to enable \"Allow outdated addons\" in ESO") + logging.info("Add-On " + name + + " installed successfully!\nPlease make sure to enable \"Allow outdated addons\" in ESO") return 0 except Exception as ex: logging.error("Could not install Add-On " + name + ", try doing it manually") diff --git a/fishy/helper/luaparser.py b/fishy/helper/luaparser.py index ebebead..a095ae7 100644 --- a/fishy/helper/luaparser.py +++ b/fishy/helper/luaparser.py @@ -18,7 +18,9 @@ def _sv_parser(path): - remove empty expressions EXPRESSIONS: A) List-Start "name=", B) Variable assignment "name=val", C) List End "}" """ - for old, new in ((",", "\n"), ("{", "{\n"), ("}", "}\n"), ("{", ""), (",", ""), ("[", ""), ("]", ""), ('"', ""), (" ", "")): + subs = ((",", "\n"), ("{", "{\n"), ("}", "}\n"), + ("{", ""), (",", ""), ("[", ""), ("]", ""), ('"', ""), (" ", "")) + for old, new in subs: lua = lua.replace(old, new) lua = lua.lower().split("\n") lua = [expression for expression in lua if expression]