Python >= 3.10

Author: scivision

.flake8

@@ -1,6 +1,3 @@
 [flake8]
 max-line-length = 132
 exclude = .git,__pycache__,.eggs/,doc/,docs/,build/,dist/,archive/
-per-file-ignores =
-    __init__.py:F401
-    modules.py:F401

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.11' ]
+        python-version: [ '3.10', '3.11' ]
     name: Lint Python ${{ matrix.python-version }}
 
     steps:

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mozloc"
-version = "1.5.0"
+version = "1.6.0"
 description = "Using Mozilla Location services, log location vs. time using WiFi or convert to KML."
 keywords = ["wifi", "geolocation"]
 classifiers = ["Development Status :: 5 - Production/Stable",
@@ -18,7 +18,7 @@ classifiers = ["Development Status :: 5 - Production/Stable",
  "Topic :: System :: Networking",
  "Topic :: Utilities"
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dynamic = ["readme"]
 dependencies = ["requests", "pandas"]
 

src/mozloc/__init__.py

@@ -1,2 +1,4 @@
 from .base import log_wifi_loc
 from .modules import get_signal, parse_signal, cli_config_check
+
+__all__ = ["log_wifi_loc", "get_signal", "parse_signal", "cli_config_check"]

src/mozloc/modules.py

@@ -1,10 +1,15 @@
 import sys
 
-if sys.platform == "win32":
-    from .netsh import cli_config_check, get_signal, parse_signal
-elif sys.platform == "linux":
-    from .netman import cli_config_check, get_signal, parse_signal
-elif sys.platform == "darwin":
-    from .airport import cli_config_check, get_signal, parse_signal
-else:
-    raise ImportError(f"MozLoc doesn't work with platform {sys.platform}")
+
+match sys.platform:
+    case "win32":
+        from .netsh import cli_config_check, get_signal, parse_signal
+    case "linux":
+        from .netman import cli_config_check, get_signal, parse_signal
+    case "darwin":
+        from .airport import cli_config_check, get_signal, parse_signal
+    case _:
+        raise ImportError(f"MozLoc doesn't work with platform {sys.platform}")
+
+
+__all__ = ["cli_config_check", "get_signal", "parse_signal"]

src/mozloc/web.py

@@ -7,12 +7,13 @@
 
 
 def get_loc_mozilla(dat: T.Sequence[T.Any], url: str):
-    if isinstance(dat, pandas.DataFrame):
-        json_to = dat.to_json(orient="records")
-    elif isinstance(dat, list):
-        json_to = json.dumps(dat)
-    else:
-        raise TypeError("Unknown data format")
+    match dat:
+        case pandas.DataFrame():
+            json_to = dat.to_json(orient="records")
+        case list():
+            json_to = json.dumps(dat)
+        case _:
+            raise TypeError("Unknown data format")
 
     json_to = '{ "wifiAccessPoints":' + json_to + "}"
     try: