more python 3.2 fixes

[zonemaker.git] / zone-maker

diff --git a/zone-maker b/zone-maker
index 100b17a7932caa0c09568f1b18cb0ee8e7b6fa0e..4a02e17d85ead5a6bd0c7328d5c3b33b124db570 100755 (executable)
--- a/zone-maker
+++ b/zone-maker
@@ -1,20 +1,26 @@
 #!/usr/bin/python3
 import sys, os
 #!/usr/bin/python3
 import sys, os

+from zonemaker.zone import Zone
+#import typing

 
 def load_module(name, path, write_bytecode = False):
 
 def load_module(name, path, write_bytecode = False):

-    import importlib.machinery

     old_val = sys.dont_write_bytecode
     sys.dont_write_bytecode = not write_bytecode
     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
 
     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
-    for zone in zones:
-        zone.write(sys.stdout)
+    zone = zonefile.__zone__ # type: Zone
+    zone.write()

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