From ac5482335d7be518d000890697337dbb1ead9c9f Mon Sep 17 00:00:00 2001 From: mwiegand Date: Wed, 14 Jul 2021 11:48:36 +0200 Subject: [PATCH] wip --- bundles/bind/metadata.py | 13 ++++++------- libs/hashable.py | 9 --------- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 libs/hashable.py diff --git a/bundles/bind/metadata.py b/bundles/bind/metadata.py index 90c3ec4..b006405 100644 --- a/bundles/bind/metadata.py +++ b/bundles/bind/metadata.py @@ -1,5 +1,4 @@ from ipaddress import ip_interface -hdict, hlist = repo.libs.hashable.hdict, repo.libs.hashable.hlist defaults = { @@ -76,9 +75,9 @@ def collect_records(metadata): for type, values in records.items(): for value in values: zones\ - .setdefault(zone, set())\ - .add( - hdict({'name': name, 'type': type, 'value': value}) + .setdefault(zone, [])\ + .append( + {'name': name, 'type': type, 'value': value} ) return { @@ -105,10 +104,10 @@ def ns_records(metadata): return { 'bind': { 'zones': { - zone: { - hdict({'name': '@', 'type': 'NS', 'value': f"{nameserver}."}) + zone: [ + {'name': '@', 'type': 'NS', 'value': f"{nameserver}."} for nameserver in nameservers - } for zone in metadata.get('bind/zones').keys() + ] for zone in metadata.get('bind/zones').keys() }, }, } diff --git a/libs/hashable.py b/libs/hashable.py deleted file mode 100644 index 9ed68b1..0000000 --- a/libs/hashable.py +++ /dev/null @@ -1,9 +0,0 @@ -import json - -class hdict(dict): - def __hash__(self): - return hash(json.dumps(self, sorted=True)) - -class hlist(list): - def __hash__(self): - return hash(json.dumps(self, sorted=True))