more python 3.2 fixes

[zonemaker.git] / zonemaker / zone.py

diff --git a/zonemaker/zone.py b/zonemaker/zone.py
index 390b0dd4de65ceefa2ab35ad72d9da090aa42dcf..330c1842d3978440f1bf54127dc482d7062de472 100644 (file)
--- a/zonemaker/zone.py
+++ b/zonemaker/zone.py
@@ -1,5 +1,5 @@
 import re, datetime
-from typing import List, Dict, Any, Iterator, Tuple, Sequence
+#from typing import *
 
 
 second = 1
@@ -13,12 +13,14 @@ REGEX_ipv4  = r'^\d{1,3}(\.\d{1,3}){3}$'
 REGEX_ipv6  = r'^[a-fA-F0-9]{1,4}(:[a-fA-F0-9]{1,4}){7}$'
 
 def check_label(label: str) -> str:
+    label = str(label)
     pattern = r'^{0}$'.format(REGEX_label)
     if re.match(pattern, label):
         return label
     raise Exception(label+" is not a valid label")
 
 def check_hostname(name: str) -> str:
+    name = str(name)
     # check hostname for validity
     pattern = r'^{0}(\.{0})*\.?$'.format(REGEX_label)
     if re.match(pattern, name):
@@ -26,16 +28,19 @@ def check_hostname(name: str) -> str:
     raise Exception(name+" is not a valid hostname")
 
 def check_hex(data: str) -> str:
+    data = str(data)
     if re.match('^[a-fA-F0-9]+$', data):
         return data
     raise Exception(data+" is not valid hex data")
 
 def check_ipv4(address: str) -> str:
+    address = str(address)
     if re.match(REGEX_ipv4, address):
         return address
     raise Exception(address+" is not a valid IPv4 address")
 
 def check_ipv6(address: str) -> str:
+    address = str(address)
     if re.match(REGEX_ipv6, address):
         return address
     raise Exception(address+" is not a valid IPv6 address")
@@ -54,7 +59,7 @@ def time(time: int) -> str:
     else:
         return str(time)
 
-def column_widths(datas: Sequence, widths: Sequence[int]):
+def column_widths(datas: 'Sequence', widths: 'Sequence[int]'):
     assert len(datas) == len(widths)+1, "There must be as one more data points as widths"
     result = ""
     width_sum = 0
@@ -85,7 +90,7 @@ class A:
     def __init__(self, address: str) -> None:
         self._address = check_ipv4(address)
     
-    def generate_rr(self, owner: str, zone: 'Zone') -> Any:
+    def generate_rr(self, owner: str, zone: 'Zone') -> 'Any':
         return zone.RR(owner, 'A', self._address)
 
 
@@ -93,7 +98,7 @@ class AAAA:
     def __init__(self, address: str) -> None:
         self._address = check_ipv6(address)
     
-    def generate_rr(self, owner: str, zone: 'Zone') -> Any:
+    def generate_rr(self, owner: str, zone: 'Zone') -> 'Any':
         return zone.RR(owner, 'AAAA', self._address)
 
 
@@ -102,7 +107,7 @@ class MX:
         self._priority = int(prio)
         self._name = check_hostname(name)
     
-    def generate_rr(self, owner: str, zone: 'Zone') -> Any:
+    def generate_rr(self, owner: str, zone: 'Zone') -> 'Any':
         return zone.RR(owner, 'MX', '{0} {1}'.format(self._priority, zone.abs_hostname(self._name)))
 
 
@@ -115,7 +120,7 @@ class SRV:
         self._port = int(port)
         self._name = check_hostname(name)
     
-    def generate_rr(self, owner: str, zone: 'Zone') -> Any:
+    def generate_rr(self, owner: str, zone: 'Zone') -> 'Any':
         return zone.RR('_{0}._{1}.{2}'.format(self._service, self._protocol, owner), 'SRV',
                        '{0} {1} {2} {3}'.format(self._priority, self._weight, self._port, zone.abs_hostname(self._name)))
 
@@ -144,7 +149,7 @@ class TLSA:
         self._matching_type = int(matching_type)
         self._data = check_hex(data)
     
-    def generate_rr(self, owner: str, zone: 'Zone') -> Any:
+    def generate_rr(self, owner: str, zone: 'Zone') -> 'Any':
         return zone.RR('_{0}._{1}.{2}'.format(self._port, self._protocol, owner), 'TLSA', '{0} {1} {2} {3}'.format(self._usage, self._selector, self._matching_type, self._data))
 
 
@@ -152,7 +157,7 @@ class CNAME:
     def __init__(self, name: str) -> None:
         self._name = check_hostname(name)
     
-    def generate_rr(self, owner: str, zone: 'Zone') -> Any:
+    def generate_rr(self, owner: str, zone: 'Zone') -> 'Any':
         return zone.RR(owner, 'CNAME', zone.abs_hostname(self._name))
 
 
@@ -160,7 +165,7 @@ class NS:
     def __init__(self, name: str) -> None:
         self._name = check_hostname(name)
     
-    def generate_rr(self, owner: str, zone: 'Zone') -> Any:
+    def generate_rr(self, owner: str, zone: 'Zone') -> 'Any':
         return zone.RR(owner, 'NS', zone.abs_hostname(self._name))
 
 
@@ -171,15 +176,15 @@ class DS:
         self._alg = int(alg)
         self._digest = int(digest)
     
-    def generate_rr(self, owner: str, zone: 'Zone') -> Any:
+    def generate_rr(self, owner: str, zone: 'Zone') -> 'Any':
         return zone.RR(owner, 'DS', '{0} {1} {2} {3}'.format(self._tag, self._alg, self._digest, self._key))
 
 ## Higher-level classes
 class Name:
-    def __init__(self, *records: List[Any]) -> None:
+    def __init__(self, *records: 'List[Any]') -> None:
         self._records = records
     
-    def generate_rrs(self, owner: str, zone: 'Zone') -> Iterator:
+    def generate_rrs(self, owner: str, zone: 'Zone') -> 'Iterator':
         for record in self._records:
             # this could still be a list
             if isinstance(record, list):
@@ -202,10 +207,10 @@ def SecureDelegation(name: str, tag: int, alg: int, digest: int, key: str) -> Na
 
 
 class Zone:
-    def __init__(self, name: str, serialfile: str, mail: str, NS: List[str],
+    def __init__(self, name: str, serialfile: str, mail: str, NS: 'List[str]',
                  secondary_refresh: int, secondary_retry: int, secondary_expire: int,
                  NX_TTL: int = None, A_TTL: int = None, other_TTL: int = None,
-                 domains: Dict[str, Any] = {}) -> None:
+                 domains: 'Dict[str, Any]' = {}) -> None:
         self._serialfile = serialfile
         
         if not name.endswith('.'): raise Exception("Expected an absolute hostname")
@@ -253,7 +258,7 @@ class Zone:
         try:
             with open(self._serialfile) as f:
                 cur_serial = int(f.read())
-        except FileNotFoundError:
+        except OSError: # FileNotFoundError has been added in Python 3.3
             pass
         # increment serial
         cur_serial += 1
@@ -263,7 +268,7 @@ class Zone:
         # be done
         return cur_serial
     
-    def generate_rrs(self) -> Iterator:
+    def generate_rrs(self) -> 'Iterator':
         # SOA record
         serial = self.inc_serial()
         yield self.RR(self._name, 'SOA',