lint and update

Author: jschlyter

.github/workflows/test.yml

@@ -34,4 +34,4 @@ jobs:
           poetry run pylama dnscatz
       - name: Pytest
         run: |
-          poetry run pytest --isort --black
+          poetry run pytest --isort --ruff --ruff-format

dnscatz/__init__.py

@@ -1,3 +1,3 @@
-import pkg_resources
+from importlib.metadata import version
 
-__version__ = pkg_resources.get_distribution("dnscatz").version
+__version__ = version("dnscatz")

dnscatz/catz.py

@@ -1,3 +1,4 @@
+import contextlib
 import logging
 import os
 import re
@@ -70,10 +71,8 @@ def parse_config_catalog_zone(
         zone = None
         if zonefile := zone_dict.get("zonefile"):
             zonefile = os.path.join(cwd, zonefile) if cwd else zonefile
-            try:
+            with contextlib.suppress(FileNotFoundError):
                 zone = dns.zone.from_file(zonefile, origin=name)
-            except FileNotFoundError:
-                pass
         else:
             zonefile = None
 

dnscatz/catz2nsd.py

@@ -16,6 +16,7 @@
 """
 
 import argparse
+import contextlib
 import logging
 import os
 import re
@@ -71,14 +72,13 @@ def parse_config(
 def get_current_zones(filename: str) -> Dict[str, str]:
     """Get dictionary of current zones and patterns"""
     res = {}
-    try:
-        for line in open(filename).readlines():
-            if line.startswith("#"):
-                continue
-            if match := re.match(r"^add (\S+) (\w+)$", line.rstrip()):
-                res[match.group(1).lower()] = match.group(2)
-    except FileNotFoundError:
-        pass
+    with contextlib.suppress(FileNotFoundError):  # noqa
+        with open(filename) as fp:
+            for line in fp.readlines():
+                if line.startswith("#"):
+                    continue
+                if match := re.match(r"^add (\S+) (\w+)$", line.rstrip()):
+                    res[match.group(1).lower()] = match.group(2)
     return res
 
 

dnscatz/utils.py

@@ -6,7 +6,8 @@
 
 def read_multidicts(filename: str) -> List[dict]:
     """Read multiple YAML dictionaries from file, return list of them"""
-    return parse_multidicts(open(filename).read())
+    with open(filename) as fp:
+        return parse_multidicts(fp.read())
 
 
 def parse_multidicts(config: str) -> List[dict]:

dnscatz/zones2catz.py

@@ -25,7 +25,7 @@
 
 
 def generate_catalog_zone(
-    origin: str, zones: List[str] = [], zonelist: Optional[str] = None
+    origin: str, zones: Optional[List[str]] = None, zonelist: Optional[str] = None
 ) -> str:
     buf = StringIO()
     serial = int(time.time())
@@ -52,14 +52,14 @@ def generate_catalog_zone(
     print(f"{origin} {DEFAULT_TTL} IN NS invalid.")
     print(f'version.{origin} {DEFAULT_TTL} IN TXT "{CATZ_VERSION}"')
 
-    for zone in zones:
+    for zone in zones or []:
         if not zone.endswith("."):
             zone += "."
         zone_id = uuid.uuid5(uuid.NAMESPACE_DNS, zone)
         print(f"{zone_id}.zones.{origin} {DEFAULT_TTL} IN PTR {zone}")
 
     if zonelist:
-        with open(zonelist, mode="r") as csv_file:
+        with open(zonelist) as csv_file:
             csv_reader = csv.DictReader(csv_file, fieldnames=["zone", "group"])
             for row in csv_reader:
                 zone = row["zone"].strip()
@@ -108,7 +108,7 @@ def main() -> None:
     catalog_zone_str = generate_catalog_zone(origin=origin, zonelist=args.zonelist)
 
     if args.output:
-        with open(args.output, "wt") as output_file:
+        with open(args.output, "w") as output_file:
             output_file.write(catalog_zone_str)
     else:
         print(catalog_zone_str)