Merge branch 'develop'

dyn_gandi.py

@@ -16,11 +16,11 @@
 import json
 import os
 import sys
-import re
 from configparser import ConfigParser
 from datetime import datetime
 
 import docopt as docpt
+import tldextract
 from docopt import docopt
 from ip_resolver import IpResolver, IpResolverError
 
@@ -189,12 +189,12 @@ def main():
     domain = config['dns']['domain']  # type: str
 
     # Sub-domain check
-    domain = domain.replace(".co.uk", ".co_uk")
-    if re.match(r"^.+\.[^.]+\.[^.]+$", domain):
+    domain_ext = tldextract.extract(domain)
+    if domain_ext.subdomain:
         if verbose:
             print("Warning: removing sub-domain part of %s" % domain)
-        domain = re.sub(r"^.+\.([^.]+\.[^.]+)$", r"\g<1>", domain)
-    domain = domain.replace(".co_uk", ".co.uk")
+
+        domain = f'{domain_ext.domain}.{domain_ext.suffix}'
 
     if verbose:
         print("Domain: %s" % domain)

livedns_client.py

@@ -37,6 +37,7 @@ def _query_api(self, method, query, json_data=None):
         url = "%s%s" % (self.url, urllib.parse.quote(query))
 
         headers = {
+            "x-api-key":        self.key,
             "Authorization":    "Apikey %s" % self.key,
             "Accept":           "application/json",
         }

setup.py

@@ -1,6 +1,7 @@
 from setuptools import setup, find_packages
 
 requires = [
+    'tldextract',
     'docopt',
     'requests',
 ]