🎨 Fix #14, fix inconsistent return

Freed-Wu · Jan 23, 2023 · 6e4a057 · 6e4a057
1 parent ca75799
commit 6e4a057
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/src/translate_shell/translators/online/bing.py b/src/translate_shell/translators/online/bing.py
@@ -53,7 +53,7 @@ def __call__(self, text: str, tl: str, sl: str) -> TRANSLATION | None:
         }
         resp = self.http_get(url, None, headers)
         if not resp:
-            return
+            return None
         res = self.create_translation(text, tl, sl)
         res["phonetic"] = self.get_phonetic(resp)
         res["explains"] = self.get_explains(resp)

diff --git a/src/translate_shell/translators/online/google.py b/src/translate_shell/translators/online/google.py
@@ -58,7 +58,7 @@ def __call__(self, text: str, tl: str, sl: str) -> TRANSLATION | None:
         url = self.get_url(sl, tl, text)
         resp = self.http_get(url)
         if not resp:
-            return
+            return None
         obj = json.loads(resp)
 
         res = self.create_translation(text, tl, sl)

diff --git a/src/translate_shell/translators/online/haici.py b/src/translate_shell/translators/online/haici.py
@@ -38,7 +38,7 @@ def __call__(self, text: str, tl: str, sl: str) -> TRANSLATION | None:
         req["q"] = quote_plus(text)
         resp = self.http_get(url, req)
         if not resp:
-            return
+            return None
 
         res = self.create_translation(text, tl, sl)
         res["phonetic"] = self.get_phonetic(resp)

diff --git a/src/translate_shell/translators/online/youdaozhiyun.py b/src/translate_shell/translators/online/youdaozhiyun.py
@@ -80,12 +80,13 @@ def __call__(self, text: str, tl: str, sl: str) -> TRANSLATION | None:
             try:
                 obj = json.loads(resp)
             except json.decoder.JSONDecodeError:
-                return
+                logger.error("Wrong json format!")
+                return None
         else:
-            return
+            return None
         if obj["errorCode"] != 0:
             logger.warning(ERROR.get(obj["errorCode"], "Unknown error!"))
-            return
+            return None
 
         res = self.create_translation(text, tl, sl)
         basic = obj.get("basic")

diff --git a/src/translate_shell/translators/stardict/__init__.py b/src/translate_shell/translators/stardict/__init__.py
@@ -50,7 +50,7 @@ def __call__(self, text: str, tl: str, sl: str) -> TRANSLATION | None:
         """
         tokens, dictionary = self.get_tokens(text, tl, sl)
         if tokens == []:
-            return
+            return None
         res = self.create_translation(text, tl, sl)
         if dictionary == "langdao-ec-gb":
             from .langdao_ec_gb import parse_tokens

diff --git a/src/translate_shell/ui/repl.py b/src/translate_shell/ui/repl.py
@@ -30,6 +30,7 @@ def run(args: Namespace) -> None:
             )
             process(args, True)
         except KeyboardInterrupt:
+            # skipcq: PYL-W0511
             # TODO: make the last line gray like ptpython
             print("")
             continue