pvl.dns.zone: fix process_include
authorTero Marttila <tero.marttila@aalto.fi>
Fri, 27 Feb 2015 17:02:13 +0200
changeset 642 c25834508569
parent 641 9d36e312e6a7
child 643 eda838f84366
pvl.dns.zone: fix process_include
pvl/dns/zone.py
--- a/pvl/dns/zone.py	Fri Feb 27 16:46:33 2015 +0200
+++ b/pvl/dns/zone.py	Fri Feb 27 17:02:13 2015 +0200
@@ -307,13 +307,13 @@
         Raises ZoneLineError.
     """
 
-    path = os.path.join(os.path.dirname(file.name), include_include)
+    path = os.path.join(os.path.dirname(line.file), include_filename)
 
     if include_origin:
         origin = pvl.dns.labels.join(include_origin, origin)
 
     for record in ZoneRecord.load(open(path), origin, **opts) :
-        yield line, record
+        yield record
 
 class ZoneRecord (object) :
     """