use try: except

Author: scivision

pyproject.toml

@@ -27,7 +27,8 @@ readme = {file = ["README.md"], content-type = "text/markdown"}
 
 [project.optional-dependencies]
 tests = ["pytest"]
-lint = ["flake8", "flake8-bugbear", "flake8-builtins", "flake8-blind-except", "mypy"]
+lint = ["flake8", "flake8-bugbear", "flake8-builtins", "flake8-blind-except",
+"mypy", "types-requests"]
 
 [tool.black]
 line-length = 100

src/mozloc/__main__.py

@@ -15,17 +15,21 @@
 p = argparse.ArgumentParser()
 p.add_argument("logfile", help="logfile to append location to", nargs="?")
 p.add_argument(
-    "-T", "--cadence", help="how often to update [sec]. Some laptops cannot go faster than 30 sec.", default=60, type=float
+    "-T",
+    "--cadence",
+    help="how often to update [sec]. Some laptops cannot go faster than 30 sec.",
+    default=60,
+    type=float,
 )
 p.add_argument(
     "-url",
     help="Mozilla location services URL--don't use this default test key",
     default="https://location.services.mozilla.com/v1/geolocate?key=test",
 )
 p.add_argument("-i", "--infile", help="use raw text saved from command line")
-p = p.parse_args()
+args = p.parse_args()
 
-if p.infile:
-    process_file(p.infile, mozilla_url=p.url)
+if args.infile:
+    process_file(args.infile, mozilla_url=args.url)
 else:
-    log_wifi_loc(cadence_sec=p.cadence, mozilla_url=p.url, logfile=p.logfile)
+    log_wifi_loc(cadence_sec=args.cadence, mozilla_url=args.url, logfile=args.logfile)

src/mozloc/airport.py

@@ -7,19 +7,25 @@
 import subprocess
 import re
 
-EXE = shutil.which("airport", path="/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources")
+EXE = shutil.which(
+    "airport",
+    path="/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources",
+)
 if not EXE:
     raise ImportError("Could not find Airport")
 
 
 def cli_config_check() -> bool:
     # %% check that Airport is available and WiFi is active
-    ret = subprocess.run([EXE, "--getinfo"], stdout=subprocess.PIPE, text=True, timeout=30)
 
-    if ret.returncode != 0:
+    assert isinstance(EXE, str)
+    try:
+        ret = subprocess.check_output([EXE, "--getinfo"], text=True, timeout=30)
+    except subprocess.CalledProcessError as err:
+        logging.error(err)
         return False
 
-    stdout = ret.stdout.strip().lower()
+    stdout = ret.strip().lower()
     if len(stdout) == "airport: off":
         return False
 
@@ -32,12 +38,13 @@ def cli_config_check() -> bool:
 
 def get_signal() -> str:
 
-    ret = subprocess.run([EXE, "-s"], timeout=30.0, stdout=subprocess.PIPE, text=True)
+    assert isinstance(EXE, str)
+    try:
+        ret = subprocess.check_output([EXE, "-s"], text=True, timeout=30.0)
+    except subprocess.CalledProcessError as err:
+        logging.error(f"consider slowing scan cadence. {err}")
 
-    if ret.returncode != 0:
-        logging.error("consider slowing scan cadence.")
-
-    return ret.stdout
+    return ret
 
 
 def parse_signal(raw: str) -> list[dict[str, T.Any]]:

src/mozloc/base.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from time import sleep
 from pathlib import Path
 import logging
@@ -24,7 +25,7 @@ def process_file(file: Path, mozilla_url: str):
     print(stat)
 
 
-def log_wifi_loc(cadence_sec: float, mozilla_url: str, logfile: Path = None):
+def log_wifi_loc(cadence_sec: float, mozilla_url: str, logfile: Path | None = None):
 
     if logfile:
         logfile = Path(logfile).expanduser()

src/mozloc/csv2kml/__main__.py

@@ -7,6 +7,6 @@
 p = argparse.ArgumentParser()
 p.add_argument("logfn", help="csv logfile to read")
 p.add_argument("kmlfn", help="kml filename to write")
-p = p.parse_args()
+args = p.parse_args()
 
-csv2kml(p.logfn, p.kmlfn)
+csv2kml(args.logfn, args.kmlfn)

src/mozloc/netman.py

@@ -9,23 +9,26 @@
 import io
 from time import sleep
 
-NMCLI = shutil.which("nmcli")
-if not NMCLI:
+EXE = shutil.which("nmcli")
+if not EXE:
     raise ImportError('Could not find NetworkManager "nmcli"')
 
-NMCMD = [NMCLI, "-g", "SSID,BSSID,FREQ,SIGNAL", "device", "wifi"]  # Debian stretch, Ubuntu 18.04
-NMLEG = [NMCLI, "-t", "-f", "SSID,BSSID,FREQ,SIGNAL", "device", "wifi"]  # ubuntu 16.04
-NMSCAN = [NMCLI, "device", "wifi", "rescan"]
+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"]
 
 
 def cli_config_check() -> bool:
     # %% check that NetworkManager CLI is available and WiFi is active
-    ret = subprocess.run([NMCLI, "-t", "radio", "wifi"], stdout=subprocess.PIPE, text=True, timeout=2)
 
-    if ret.returncode != 0:
+    assert isinstance(EXE, str)
+    try:
+        ret = subprocess.check_output([EXE, "-t", "radio", "wifi"], text=True, timeout=2)
+    except subprocess.CalledProcessError as err:
+        logging.error(err)
         return False
 
-    stdout = ret.stdout.strip().split(":")
+    stdout = ret.strip().split(":")
     if "enabled" in stdout:
         return True
 
@@ -42,16 +45,19 @@ def cli_config_check() -> bool:
 
 def get_signal() -> str:
 
-    ret = subprocess.run(NMCMD, timeout=1.0)
-    if ret.returncode != 0:
-        raise ConnectionError("could not connect with NetworkManager for WiFi")
+    try:
+        subprocess.check_call(NMCMD, 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.
-    ret = subprocess.run(NMSCAN, timeout=1.0, stdout=subprocess.PIPE, text=True)
-    if ret.returncode != 0:
-        logging.error("consider slowing scan cadence.")
+    try:
+        ret = subprocess.check_output(NMSCAN, timeout=1.0, text=True)
+    except subprocess.CalledProcessError as err:
+        logging.error(f"consider slowing scan cadence. {err}")
 
-    return ret.stdout
+    return ret
 
 
 def parse_signal(raw: str) -> list[dict[str, T.Any]]:

src/mozloc/netsh.py

@@ -7,20 +7,28 @@
 import io
 import shutil
 
-CLI = shutil.which("netsh")
-if not CLI:
+EXE = shutil.which("netsh")
+if not EXE:
     raise ImportError('Could not find NetSH "netsh"')
 
-CMD = [CLI, "wlan", "show", "networks", "mode=bssid"]
+CMD = [EXE, "wlan", "show", "networks", "mode=bssid"]
 
 
 def cli_config_check() -> bool:
-    # %% check that NetSH CLI is available and WiFi is active
-    ret = subprocess.run(CMD, stdout=subprocess.PIPE, text=True, timeout=2)
-    for line in ret.stdout.split("\n"):
+    # %% check that NetSH EXE is available and WiFi is active
+    try:
+        ret = subprocess.check_output(CMD, text=True, timeout=2)
+    except subprocess.CalledProcessError as err:
+        logging.error(err)
+        return False
+
+    for line in ret.split("\n"):
         if "networks currently visible" in line:
             return True
-        if "The wireless local area network interface is powered down and doesn't support the requested operation" in line:
+        if (
+            "The wireless local area network interface is powered down and doesn't support the requested operation"
+            in line
+        ):
             logging.error("must enable WiFi, it appears to be turned off.")
             return False
 
@@ -30,15 +38,17 @@ def cli_config_check() -> bool:
 
 def get_signal() -> str:
     """
-    get signal strength using CLI
+    get signal strength using EXE
 
-    returns dict of data parsed from CLI
+    returns dict of data parsed from EXE
     """
-    ret = subprocess.run(CMD, timeout=1.0, stdout=subprocess.PIPE, text=True)
-    if ret.returncode != 0:
-        logging.error("consider slowing scan cadence.")
 
-    return ret.stdout
+    try:
+        ret = subprocess.check_output(CMD, timeout=1.0, text=True)
+    except subprocess.CalledProcessError as err:
+        logging.error(f"consider slowing scan cadence.  {err}")
+
+    return ret
 
 
 def parse_signal(raw: str) -> list[dict[str, T.Any]]: