aiomisc 17.5.29__tar.gz → 17.5.31__tar.gz

{aiomisc-17.5.29 → aiomisc-17.5.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aiomisc
-Version: 17.5.29
+Version: 17.5.31
 Summary: aiomisc - miscellaneous utils for asyncio
 Home-page: https://github.com/aiokitchen/aiomisc
 License: MIT

{aiomisc-17.5.29 → aiomisc-17.5.31}/aiomisc/service/dns/records.py

@@ -88,7 +88,7 @@ class DNSRecord:
     type: RecordType
     data: RD
     cls: DNSClass = field(default=DNSClass.IN)
-    ttl: int = field(default=3600)
+    ttl: int = field(default=3600, compare=False)
 
     def rr(self, query_type: int) -> dnslib.RR:
         return dnslib.RR(

{aiomisc-17.5.29 → aiomisc-17.5.31}/aiomisc/service/dns/store.py

@@ -1,4 +1,4 @@
-from typing import Optional, Sequence, Tuple
+from typing import Iterable, Mapping, Optional, Sequence, Tuple
 
 from .records import DNSRecord, RecordType
 from .tree import RadixTree
@@ -49,3 +49,22 @@ class DNSStore:
     @staticmethod
     def get_reverse_tuple(zone_name: str) -> Tuple[str, ...]:
         return tuple(zone_name.strip(".").split("."))[::-1]
+
+    def replace(
+        self, zones_data: Mapping[str, Iterable[DNSRecord]],
+    ) -> None:
+        """
+        Atomically replace all zones with new ones this method is safe
+        because it replaces all zones at once. zone_data is a mapping
+        zone name and a sequence of DNSRecord objects.
+
+        If any of the zones or records is invalid, nothing will be replaced.
+
+        This method is useful for reload configuration from disk
+        or database or etc.
+        """
+        new_zones: RadixTree[DNSZone] = RadixTree()
+        for zone_name, records in zones_data.items():
+            zone = DNSZone(zone_name, *records)
+            new_zones.insert(self.get_reverse_tuple(zone.name), zone)
+        self.zones = new_zones

aiomisc-17.5.31/aiomisc/service/dns/zone.py

@@ -0,0 +1,67 @@
+from collections import defaultdict
+from typing import DefaultDict, Iterable, Sequence, Set, Tuple
+
+from .records import DNSRecord, RecordType
+
+
+RecordsType = DefaultDict[Tuple[str, RecordType], Set[DNSRecord]]
+
+
+class DNSZone:
+    records: RecordsType
+    name: str
+
+    __slots__ = ("name", "records")
+
+    def __init__(self, name: str, *records: DNSRecord) -> None:
+        if not name.endswith("."):
+            name += "."
+        self.name = name
+        self.records = defaultdict(set)
+
+        for record in records:
+            self.add_record(record)
+
+    def add_record(self, record: DNSRecord) -> None:
+        if not self.check_record(record):
+            raise ValueError(
+                f"Record {record.name} does not belong to zone {self.name}",
+            )
+        self.records[(record.name, record.type)].add(record)
+
+    def remove_record(self, record: DNSRecord) -> None:
+        key = (record.name, record.type)
+        if key in self.records:
+            self.records[key].discard(record)
+            if self.records[key]:
+                return
+            del self.records[key]
+
+    def get_records(
+        self, name: str, record_type: RecordType,
+    ) -> Sequence[DNSRecord]:
+        if not name.endswith("."):
+            name += "."
+        return tuple(self.records.get((name, record_type), ()))
+
+    def check_record(self, record: DNSRecord) -> bool:
+        return record.name.endswith(self.name)
+
+    def replace(self, records: Iterable[DNSRecord]) -> None:
+        """
+        Atomically replace all records in specified zone with new ones.
+        This method is safe because it replaces all records at once.
+
+        If any of the records does not belong to the zone, ValueError
+        will be raised and no records will be replaced.
+        """
+        new_records: RecordsType = defaultdict(set)
+
+        for record in records:
+            if not self.check_record(record):
+                raise ValueError(
+                    f"Record {record.name} does not "
+                    f"belong to zone {self.name}",
+                )
+            new_records[(record.name, record.type)].add(record)
+        self.records = new_records

{aiomisc-17.5.29 → aiomisc-17.5.31}/aiomisc/service/raven.py

@@ -70,7 +70,7 @@ class AioHttpTransportBase(
     def __init__(
         self, parsed_url: Optional[str] = None, *, verify_ssl: bool = True,
         timeout: TimeoutType = defaults.TIMEOUT, keepalive: bool = True,
-        family: int = socket.AF_INET,
+        family: socket.AddressFamily = socket.AddressFamily.AF_INET,
     ):
         self._keepalive = keepalive
         self._family = family
@@ -92,7 +92,7 @@ class AioHttpTransportBase(
         return self._keepalive
 
     @property
-    def family(self) -> int:
+    def family(self) -> socket.AddressFamily:
         return self._family
 
     def _client_session_factory(self) -> aiohttp.ClientSession:

{aiomisc-17.5.29 → aiomisc-17.5.31}/aiomisc/version.py

@@ -2,5 +2,5 @@
 # BY: poem-plugins "git" plugin
 # NEVER EDIT THIS FILE MANUALLY
 
-version_info = (17, 5, 29)
-__version__ = "17.5.29"
+version_info = (17, 5, 31)
+__version__ = "17.5.31"

{aiomisc-17.5.29 → aiomisc-17.5.31}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "aiomisc"
 # This is a dummy version which will be rewritten with poem-plugins
-version = "17.5.29"
+version = "17.5.31"
 description = "aiomisc - miscellaneous utils for asyncio"
 authors = ["Dmitry Orlov <me@mosquito.su>"]
 readme = "README.rst"

aiomisc-17.5.29/aiomisc/service/dns/zone.py

@@ -1,44 +0,0 @@
-from collections import defaultdict
-from typing import DefaultDict, Sequence, Set, Tuple
-
-from .records import DNSRecord, RecordType
-
-
-class DNSZone:
-    records: DefaultDict[Tuple[str, RecordType], Set[DNSRecord]]
-    name: str
-
-    __slots__ = ("name", "records")
-
-    def __init__(self, name: str):
-        if not name.endswith("."):
-            name += "."
-        self.name = name
-        self.records = defaultdict(set)
-
-    def add_record(self, record: DNSRecord) -> None:
-        if not self._is_valid_record(record):
-            raise ValueError(
-                f"Record {record.name} does not belong to zone {self.name}",
-            )
-        key = (record.name, record.type)
-        self.records[key].add(record)
-
-    def remove_record(self, record: DNSRecord) -> None:
-        key = (record.name, record.type)
-        if key in self.records:
-            self.records[key].discard(record)
-            if self.records[key]:
-                return
-            del self.records[key]
-
-    def get_records(
-        self, name: str, record_type: RecordType,
-    ) -> Sequence[DNSRecord]:
-        if not name.endswith("."):
-            name += "."
-        key = (name, record_type)
-        return tuple(self.records.get(key, ()))
-
-    def _is_valid_record(self, record: DNSRecord) -> bool:
-        return record.name.endswith(self.name)