socketmap-sql 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

{socketmap_sql-0.2.0.dist-info → socketmap_sql-0.2.1.dist-info}/METADATA

@@ -1,18 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: socketmap-sql
-Version: 0.2.0
+Version: 0.2.1
 Summary: An implementation of the sendmail socketmap protocol to allow an SQL database
 Author-email: Keith Gaughan <k@stereochro.me>
-Requires-Python: >=3.8
+Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
+License-Expression: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Communications :: Email :: Mail Transport Agents
 Classifier: Topic :: Database
+License-File: LICENSE
 Project-URL: Source, https://github.com/kgaughan/socketmap-sql
 
 =============

socketmap_sql-0.2.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+socketmapsql.py,sha256=ZcApgWGIGUZ1a81uCyhMUm-evcmrzxyHAlwjs_tpNB0,7316
+socketmap_sql-0.2.1.dist-info/entry_points.txt,sha256=1N1u8xbsj9ryvD0v-HWBMxNfiCarn1Dq7pXXwjn7-8E,51
+socketmap_sql-0.2.1.dist-info/licenses/LICENSE,sha256=Du-PK9kF9TBcjQfRGArxGPH9HVDUxifjzF5yFex2NKE,1070
+socketmap_sql-0.2.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+socketmap_sql-0.2.1.dist-info/METADATA,sha256=iN1lE_1ACmwCwW3i1xaoczFdFsLa7lXNtVcZlvlKKOs,3229
+socketmap_sql-0.2.1.dist-info/RECORD,,

{socketmap_sql-0.2.0.dist-info → socketmap_sql-0.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.8.0
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any

socketmapsql.py

@@ -9,19 +9,17 @@ import configparser
 import contextlib
 import dataclasses
 import importlib
-import io
 import os.path
 import re
 import select
 import subprocess
 import sys
-from typing import Callable, Dict, List, Mapping, Optional, Tuple, TypedDict
+import typing as t
 
+__version__: str = "0.2.1"
 
-__version__ = "0.2.0"
 
-
-Transform = Callable[[str, Mapping[str, str]], List[str]]
+Transform = t.Callable[[str, t.Mapping[str, str]], list[str]]
 
 
 @dataclasses.dataclass
@@ -30,10 +28,10 @@ class TableCfg:
     transform: Transform
 
 
-class Cfg(TypedDict):
-    database: Dict[str, str]
-    misc: Dict[str, str]
-    tables: Dict[str, TableCfg]
+class Cfg(t.TypedDict):
+    database: dict[str, str]
+    misc: dict[str, str]
+    tables: dict[str, TableCfg]
 
 
 FUNC_REF_PATTERN = re.compile(
@@ -44,18 +42,18 @@ FUNC_REF_PATTERN = re.compile(
     (?P<object>[a-z_][a-z0-9_]*(?:\.[a-z_][a-z0-9_]*)*)
     $
     """,
-    re.I | re.X,
+    re.IGNORECASE | re.VERBOSE,
 )
 
 
-def match(name: str) -> Tuple[str, str]:
+def match(name: str) -> tuple[str, str]:
     matches = FUNC_REF_PATTERN.match(name)
     if not matches:
         raise ValueError(f"Malformed callable '{name}'")
     return matches.group("module"), matches.group("object")
 
 
-def resolve(module_name: str, obj_name: str) -> Callable:
+def resolve(module_name: str, obj_name: str) -> t.Callable:
     """
     Resolve a named object in a module.
     """
@@ -66,10 +64,8 @@ class MalformedNetstringError(Exception):
     pass
 
 
-def read_netstring(fp: io.TextIOWrapper) -> Optional[str]:
-    """
-    Reads a single netstring.
-    """
+def read_netstring(fp: t.IO[str]) -> str | None:
+    """Reads a single netstring."""
     ns = ""
     while True:
         c = fp.read(1)
@@ -77,7 +73,7 @@ def read_netstring(fp: io.TextIOWrapper) -> Optional[str]:
             return None
         if c == ":":
             break
-        if len(ns) > 10:
+        if len(ns) > 10:  # noqa: PLR2004
             raise MalformedNetstringError
         if c == "0" and ns == "":
             # We can't allow leading zeros.
@@ -99,31 +95,31 @@ def read_netstring(fp: io.TextIOWrapper) -> Optional[str]:
     return result
 
 
-def write_netstring(fp: io.TextIOWrapper, response: str):
+def write_netstring(fp: t.IO[str], response: str) -> None:
     fp.write(f"{len(response)}:{response},")
     fp.flush()
 
 
-def process_local(local_part: str, cfg: Mapping[str, str]) -> str:
+def process_local(local_part: str, cfg: t.Mapping[str, str]) -> str:
     delimiter = cfg.get("recipient_delimiter", "").strip()
     if delimiter != "":
         local_part = local_part.split(delimiter, 1)[0]
     return local_part.lower()
 
 
-def split(arg: str, cfg: Mapping[str, str]) -> List[str]:
+def split(arg: str, cfg: t.Mapping[str, str]) -> list[str]:
     parts = arg.split("@", 1)
     parts[0] = process_local(parts[0], cfg)
     parts[1] = parts[1].lower()
     return parts
 
 
-def parse_config(fp: io.TextIOWrapper) -> Cfg:
+def parse_config(fp: t.IO[str]) -> Cfg:
     transforms = {
-        "all": lambda arg, cfg: [arg],
-        "lowercase": lambda arg, cfg: [arg.lower()],
+        "all": lambda arg, _: [arg],
+        "lowercase": lambda arg, _: [arg.lower()],
         "local": lambda arg, cfg: [process_local(arg.split("@", 1)[0], cfg)],
-        "domain": lambda arg, cfg: [arg.split("@", 1)[1].lower()],
+        "domain": lambda arg, _: [arg.split("@", 1)[1].lower()],
         "split": split,
     }
 
@@ -157,18 +153,18 @@ def parse_config(fp: io.TextIOWrapper) -> Cfg:
     )
 
 
-def get_int(cfg: Mapping[str, str], key: str) -> Optional[int]:
+def get_int(cfg: t.Mapping[str, str], key: str) -> int | None:
     return int(cfg[key]) if key in cfg else None
 
 
 def serve_client(
-    fh_in: io.TextIOWrapper,
-    fh_out: io.TextIOWrapper,
+    fh_in: t.IO[str],
+    fh_out: t.IO[str],
     conn,
     timeout: int,
-    tables: Mapping[str, TableCfg],
-    cfg: Mapping[str, str],
-):
+    tables: t.Mapping[str, TableCfg],
+    cfg: t.Mapping[str, str],
+) -> None:
     max_requests = get_int(cfg, "max_requests")
     try:
         while True:
@@ -203,17 +199,15 @@ def serve_client(
             if result is None:
                 write_netstring(fh_out, "NOTFOUND ")
             else:
-                write_netstring(fh_out, f"OK {str(result[0])}")
+                write_netstring(fh_out, f"OK {result[0]!s}")
     except MalformedNetstringError:
         write_netstring(fh_out, "PERM malformed netstring")
     except Exception as exc:
-        write_netstring(fh_out, f"PERM {str(exc)}")
+        write_netstring(fh_out, f"PERM {exc!s}")
 
 
-def connect(settings: Dict[str, str]):
-    """
-    Connect to a database.
-    """
+def connect(settings: dict[str, str]):
+    """Connect to a database."""
     driver = importlib.import_module(settings.pop("driver", "sqlite3"))
     return driver.connect(**settings)
 
@@ -240,7 +234,7 @@ def make_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def main():
+def main() -> int:
     args = make_parser().parse_args()
 
     with contextlib.closing(args.config):
@@ -261,8 +255,9 @@ def main():
             if req == ".exit":
                 proc.terminate()
                 break
-            write_netstring(proc.stdin, req)
-            print(read_netstring(proc.stdout))
+            if proc.stdin is not None and proc.stdout is not None:
+                write_netstring(proc.stdin, req)
+                print(read_netstring(proc.stdout))
     else:
         with contextlib.closing(connect(cfg["database"])) as conn:
             serve_client(

socketmap_sql-0.2.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-socketmapsql.py,sha256=VJVawDQ4HcxUAAhKl4OIsxxJ3n2xVJPVYJVWr2l56-c,7305
-socketmap_sql-0.2.0.dist-info/entry_points.txt,sha256=1N1u8xbsj9ryvD0v-HWBMxNfiCarn1Dq7pXXwjn7-8E,51
-socketmap_sql-0.2.0.dist-info/LICENSE,sha256=Du-PK9kF9TBcjQfRGArxGPH9HVDUxifjzF5yFex2NKE,1070
-socketmap_sql-0.2.0.dist-info/WHEEL,sha256=rSgq_JpHF9fHR1lx53qwg_1-2LypZE_qmcuXbVUq948,81
-socketmap_sql-0.2.0.dist-info/METADATA,sha256=0HIm4bfejhQEUU40eKRe7XtGY5Z5SB6YsmD0vWLds5E,3233
-socketmap_sql-0.2.0.dist-info/RECORD,,