refactor RRs

[zonemaker.git] / zone-maker

diff --git a/zone-maker b/zone-maker
index 100b17a7932caa0c09568f1b18cb0ee8e7b6fa0e..57f8afe3470c4bdf169d18168d295bf6d4c41b78 100755 (executable)
--- a/zone-maker
+++ b/zone-maker
@@ -1,5 +1,7 @@
 #!/usr/bin/python3
 import sys, os
 #!/usr/bin/python3
 import sys, os

+from zonemaker.zone import Zone
+from typing import Sequence

 
 def load_module(name, path, write_bytecode = False):
     import importlib.machinery
 
 def load_module(name, path, write_bytecode = False):
     import importlib.machinery


@@ -9,12 +11,11 @@ def load_module(name, path, write_bytecode = False):
     sys.dont_write_bytecode = old_val
     return module
 
     sys.dont_write_bytecode = old_val
     return module
 

-def make_zone(filename):
+def make_zone(filename: str) -> None:

     zonefile = load_module(os.path.basename(filename), filename)
     zonefile = load_module(os.path.basename(filename), filename)

-    zones = zonefile.__zones__
-    # TODO do something more clever with the zones
+    zones = zonefile.__zones__ # type: Sequence[Zone]

     for zone in zones:
     for zone in zones:

-        zone.write(sys.stdout)
+        zone.write()

 
 if __name__ == "__main__":
     for name in sys.argv[1:]:
 
 if __name__ == "__main__":
     for name in sys.argv[1:]: