functionalize, cache, python>=3.9

Author: scivision

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.7', '3.11' ]
+        python-version: [ '3.9', '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.4.0"
+version = "1.5.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.7"
+requires-python = ">=3.9"
 dynamic = ["readme"]
 dependencies = ["requests", "pandas"]
 

src/mozloc/airport.py

@@ -2,25 +2,18 @@
 
 from __future__ import annotations
 import typing as T
-import shutil
 import logging
 import subprocess
 import re
 
-EXE = shutil.which(
-    "airport",
-    path="/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources",
-)
-if not EXE:
-    raise ImportError("Could not find Airport")
+from .cmd import get_airport
 
 
 def cli_config_check() -> bool:
     # %% check that Airport is available and WiFi is active
 
-    assert isinstance(EXE, str)
     try:
-        ret = subprocess.check_output([EXE, "--getinfo"], text=True, timeout=30)
+        ret = subprocess.check_output([get_airport(), "--getinfo"], text=True, timeout=30)
     except subprocess.CalledProcessError as err:
         logging.error(err)
         return False
@@ -38,9 +31,8 @@ def cli_config_check() -> bool:
 
 def get_signal() -> str:
 
-    assert isinstance(EXE, str)
     try:
-        ret = subprocess.check_output([EXE, "-s"], text=True, timeout=30.0)
+        ret = subprocess.check_output([get_airport(), "-s"], text=True, timeout=30.0)
     except subprocess.CalledProcessError as err:
         logging.error(f"consider slowing scan cadence. {err}")
 

src/mozloc/cmd.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+import functools
+import shutil
+
+
+@functools.cache
+def get_exe(name: str, path: str | None = None) -> str:
+    if not (exe := shutil.which(name, path=path)):
+        raise ImportError(f"{name} not found")
+    return exe
+
+
+def get_airport() -> str:
+    return get_exe(
+        "airport",
+        "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources",
+    )
+
+
+def get_nmcli() -> str:
+    return get_exe("nmcli")
+
+
+def get_netsh() -> str:
+    return get_exe("netsh")

src/mozloc/netman.py

@@ -4,26 +4,18 @@
 import typing as T
 import subprocess
 import logging
-import shutil
 import pandas
 import io
 from time import sleep
 
-EXE = shutil.which("nmcli")
-if not EXE:
-    raise ImportError('Could not find NetworkManager "nmcli"')
-
-NMCMD = [EXE, "-g", "SSID,BSSID,FREQ,SIGNAL", "device", "wifi"]  # Debian stretch, Ubuntu 18.04
-NMLEG = [EXE, "-t", "-f", "SSID,BSSID,FREQ,SIGNAL", "device", "wifi"]  # ubuntu 16.04
-NMSCAN = [EXE, "device", "wifi", "rescan"]
+from .cmd import get_nmcli
 
 
 def cli_config_check() -> bool:
     # %% check that NetworkManager CLI is available and WiFi is active
 
-    assert isinstance(EXE, str)
     try:
-        ret = subprocess.check_output([EXE, "-t", "radio", "wifi"], text=True, timeout=2)
+        ret = subprocess.check_output([get_nmcli(), "-t", "radio", "wifi"], text=True, timeout=2)
     except subprocess.CalledProcessError as err:
         logging.error(err)
         return False
@@ -45,15 +37,23 @@ def cli_config_check() -> bool:
 
 def get_signal() -> str:
 
+    cmd = [get_nmcli(), "-g", "SSID,BSSID,FREQ,SIGNAL", "device", "wifi"]
+    # Debian stretch, Ubuntu 18.04
+    # cmd = [EXE, "-t", "-f", "SSID,BSSID,FREQ,SIGNAL", "device", "wifi"]
+    # ubuntu 16.04
+
     try:
-        subprocess.check_call(NMCMD, timeout=1.0)
+        subprocess.check_call(cmd, timeout=1.0)
     except subprocess.CalledProcessError as err:
         raise ConnectionError(f"could not connect with NetworkManager for WiFi   {err}")
 
     sleep(0.5)  # nmcli errored for less than about 0.2 sec.
     # takes several seconds to update, so do it now.
+
+    scan = [get_nmcli(), "device", "wifi", "rescan"]
+
     try:
-        ret = subprocess.check_output(NMSCAN, timeout=1.0, text=True)
+        ret = subprocess.check_output(scan, timeout=1.0, text=True)
     except subprocess.CalledProcessError as err:
         logging.error(f"consider slowing scan cadence. {err}")
 

src/mozloc/netsh.py

@@ -5,19 +5,16 @@
 import subprocess
 import logging
 import io
-import shutil
 
-EXE = shutil.which("netsh")
-if not EXE:
-    raise ImportError('Could not find NetSH "netsh"')
-
-CMD = [EXE, "wlan", "show", "networks", "mode=bssid"]
+from .cmd import get_netsh
 
 
 def cli_config_check() -> bool:
     # %% check that NetSH EXE is available and WiFi is active
+    cmd = [get_netsh(), "wlan", "show", "networks", "mode=bssid"]
+
     try:
-        ret = subprocess.check_output(CMD, text=True, timeout=2)
+        ret = subprocess.check_output(cmd, text=True, timeout=2)
     except subprocess.CalledProcessError as err:
         logging.error(err)
         return False
@@ -43,8 +40,9 @@ def get_signal() -> str:
     returns dict of data parsed from EXE
     """
 
+    cmd = [get_netsh(), "wlan", "show", "networks", "mode=bssid"]
     try:
-        ret = subprocess.check_output(CMD, timeout=1.0, text=True)
+        ret = subprocess.check_output(cmd, timeout=1.0, text=True)
     except subprocess.CalledProcessError as err:
         logging.error(f"consider slowing scan cadence.  {err}")