# HG changeset patch
# User Tero Marttila <terom@paivola.fi>
# Date 1387401689 -7200
# Node ID 2b8ba955afacb4ea2155a963ed3f3a8ce8421cf6
# Parent  08176bed21e37451aa2bdf2bc6f493c12b101ed5
pvl.dns: import join() within package

diff -r 08176bed21e3 -r 2b8ba955afac bin/pvl.hosts-import
--- a/bin/pvl.hosts-import	Wed Dec 18 22:35:48 2013 +0200
+++ b/bin/pvl.hosts-import	Wed Dec 18 23:21:29 2013 +0200
@@ -102,7 +102,7 @@
 
     if '.' in name :
         host, domain = name.split('.', 1)
-        domain = pvl.dns.zone.join(domain, origin)
+        domain = pvl.dns.join(domain, origin)
     else :
         host = name
         domain = origin
@@ -154,7 +154,7 @@
             if domain == alias_domain :
                 yield (alias_host, alias_domain), 'alias', host
             else :
-                yield (alias_host, alias_domain), 'alias', pvl.dns.zone.join(host, domain)
+                yield (alias_host, alias_domain), 'alias', pvl.dns.join(host, domain)
         
         elif rr.type == 'TXT' :
             txt, = rr.data
diff -r 08176bed21e3 -r 2b8ba955afac pvl/dns/__init__.py
--- a/pvl/dns/__init__.py	Wed Dec 18 22:35:48 2013 +0200
+++ b/pvl/dns/__init__.py	Wed Dec 18 23:21:29 2013 +0200
@@ -1,2 +1,4 @@
 
 __version__ = '0.1'
+
+from pvl.dns.zone import join, fqdn