From a83a69fdb0d2c3861c73dfdfa2654d196455afa2 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Sat, 16 Apr 2022 22:47:16 +0300 Subject: [PATCH 1/3] Changed demjson to demjson3. demjson does not support python3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2b2afd6..80842d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -demjson \ No newline at end of file +demjson3 From a736a5a5ed374d177356f3a52bc1f56dee848323 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Sat, 16 Apr 2022 22:49:14 +0300 Subject: [PATCH 2/3] Changed demjson to demjson3. --- flowlauncher/FlowLauncher.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flowlauncher/FlowLauncher.py b/flowlauncher/FlowLauncher.py index 4891f92..9e511fd 100644 --- a/flowlauncher/FlowLauncher.py +++ b/flowlauncher/FlowLauncher.py @@ -4,7 +4,7 @@ import inspect import sys -import demjson +import demjson3 class FlowLauncher: @@ -18,7 +18,7 @@ def __init__(self): self.rpc_request = {'method': 'query', 'parameters': ['']} self.debugMessage = "" if len(sys.argv) > 1: # from input to get jsonrpc - self.rpc_request = demjson.decode(sys.argv[1]) + self.rpc_request = demjson3.decode(sys.argv[1]) # proxy is not working now # self.proxy = self.rpc_request.get("proxy", {}) @@ -31,7 +31,7 @@ def __init__(self): results = request_method(*request_parameters) if request_method_name in ("query", "context_menu"): - print(demjson.encode({ + print(demjson3.encode({ "result": results, "debugMessage": self.debugMessage })) From a5563b70970c66b7ca63bb7734d51d63a80d80dc Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Sat, 16 Apr 2022 22:49:54 +0300 Subject: [PATCH 3/3] Changed demjson to demjson3. --- flowlauncher/FlowLauncherAPI.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/flowlauncher/FlowLauncherAPI.py b/flowlauncher/FlowLauncherAPI.py index 030bcbe..3da5da4 100644 --- a/flowlauncher/FlowLauncherAPI.py +++ b/flowlauncher/FlowLauncherAPI.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -import demjson +import demjson3 class FlowLauncherAPI: @@ -10,7 +10,7 @@ def change_query(cls, query, requery: bool = False): """ change flow launcher query """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.ChangeQuery", "parameters": [query, requery]})) @@ -19,7 +19,7 @@ def shell_run(cls, cmd): """ run shell commands """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.ShellRun", "parameters": [cmd]})) @@ -28,7 +28,7 @@ def close_app(cls): """ close flow launcher """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.CloseApp", "parameters": []})) @@ -37,7 +37,7 @@ def hide_app(cls): """ hide flow launcher """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.HideApp", "parameters": []})) @@ -46,7 +46,7 @@ def show_app(cls): """ show flow launcher """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.ShowApp", "parameters": []})) @@ -55,7 +55,7 @@ def show_msg(cls, title: str, sub_title: str, ico_path: str = ""): """ show messagebox """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.ShowMsg", "parameters": [title, sub_title, ico_path]})) @@ -64,7 +64,7 @@ def open_setting_dialog(cls): """ open setting dialog """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.OpenSettingDialog", "parameters": []})) @@ -73,7 +73,7 @@ def start_loadingbar(cls): """ start loading animation in flow launcher """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.StartLoadingBar", "parameters": []})) @@ -82,7 +82,7 @@ def stop_loadingbar(cls): """ stop loading animation in flow launcher """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.StopLoadingBar", "parameters": []})) @@ -91,6 +91,6 @@ def reload_plugins(cls): """ reload all flow launcher plugins """ - print(demjson.encode({ + print(demjson3.encode({ "method": "Flow.Launcher.ReloadPlugins", "parameters": []}))