Cleanup mixed returns found using CodeQL

aaronkollasch · Aug 19, 2022 · 30dadc3 · 30dadc3
1 parent 8d986f0
commit 30dadc3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/photomanager/database.py b/src/photomanager/database.py
@@ -39,6 +39,7 @@ def sizeof_fmt(num: int) -> str:
         return "0 bytes"
     if num == 1:
         return "1 byte"
+    return f"{num} bytes"
 
 
 def path_is_relative_to(
@@ -55,7 +56,7 @@ def path_is_relative_to(
 def tz_str_to_tzinfo(tz: str):
     """
     Convert a timezone string (e.g. -0400) to a tzinfo
-    If "local", return None
+    If "local" or could not convert, return None
     """
     if tz == "local":
         return None
@@ -64,6 +65,7 @@ def tz_str_to_tzinfo(tz: str):
     except ValueError:
         logger = logging.getLogger(__name__)
         logger.error(f"Could not parse timezone string: {tz}")
+    return None
 
 
 class DatabaseException(PhotoManagerBaseException):

diff --git a/tests/unit_tests/test_database.py b/tests/unit_tests/test_database.py
@@ -12,7 +12,7 @@
 from photomanager.photofile import NAME_MAP_ENC, PhotoFile
 
 sizeof_fmt_expected_results = [
-    (-1, None),
+    (-1, "-1 bytes"),
     (0, "0 bytes"),
     (1, "1 byte"),
     (1023, "1023 bytes"),