X-Git-Url: https://git.ralfj.de/zonemaker.git/blobdiff_plain/8afd5eb407397e88da8f7d2151088d14abbe51e4..df4af7d06d59d207a7ae9e3838cd0956131c977e:/zone-maker

diff --git a/zone-maker b/zone-maker
index 100b17a..4a02e17 100755
--- a/zone-maker
+++ b/zone-maker
@@ -1,20 +1,26 @@
 #!/usr/bin/python3
 import sys, os
+from zonemaker.zone import Zone
+#import typing
 
 def load_module(name, path, write_bytecode = False):
-    import importlib.machinery
     old_val = sys.dont_write_bytecode
     sys.dont_write_bytecode = not write_bytecode
-    module = importlib.machinery.SourceFileLoader(name, path).load_module()
-    sys.dont_write_bytecode = old_val
+    module = None
+    try:
+        from importlib.machinery import SourceFileLoader
+        module = SourceFileLoader(name, path).load_module()
+    except ImportError:
+        import imp
+        module = imp.load_source(name, path)
+    finally:
+        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)
-    zones = zonefile.__zones__
-    # TODO do something more clever with the zones
-    for zone in zones:
-        zone.write(sys.stdout)
+    zone = zonefile.__zone__ # type: Zone
+    zone.write()
 
 if __name__ == "__main__":
     for name in sys.argv[1:]: