Update dnspython-2.2.0

lib/dns/reversename.py

@@ -1,4 +1,6 @@
-# Copyright (C) 2006, 2007, 2009-2011 Nominum, Inc.
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+# Copyright (C) 2006-2017 Nominum, Inc.
 #
 # Permission to use, copy, modify, and distribute this software and its
 # documentation for any purpose with or without fee is hereby granted,
@@ -13,16 +15,9 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-"""DNS Reverse Map Names.
-
-@var ipv4_reverse_domain: The DNS IPv4 reverse-map domain, in-addr.arpa.
-@type ipv4_reverse_domain: dns.name.Name object
-@var ipv6_reverse_domain: The DNS IPv6 reverse-map domain, ip6.arpa.
-@type ipv6_reverse_domain: dns.name.Name object
-"""
+"""DNS Reverse Map Names."""
 
 import binascii
-import sys
 
 import dns.name
 import dns.ipv6
@@ -32,58 +27,74 @@ ipv4_reverse_domain = dns.name.from_text('in-addr.arpa.')
 ipv6_reverse_domain = dns.name.from_text('ip6.arpa.')
 
 
-def from_address(text):
+def from_address(text, v4_origin=ipv4_reverse_domain,
+                 v6_origin=ipv6_reverse_domain):
     """Convert an IPv4 or IPv6 address in textual form into a Name object whose
     value is the reverse-map domain name of the address.
-    @param text: an IPv4 or IPv6 address in textual form (e.g. '127.0.0.1',
-    '::1')
-    @type text: str
-    @rtype: dns.name.Name object
+
+    *text*, a ``str``, is an IPv4 or IPv6 address in textual form
+    (e.g. '127.0.0.1', '::1')
+
+    *v4_origin*, a ``dns.name.Name`` to append to the labels corresponding to
+    the address if the address is an IPv4 address, instead of the default
+    (in-addr.arpa.)
+
+    *v6_origin*, a ``dns.name.Name`` to append to the labels corresponding to
+    the address if the address is an IPv6 address, instead of the default
+    (ip6.arpa.)
+
+    Raises ``dns.exception.SyntaxError`` if the address is badly formed.
+
+    Returns a ``dns.name.Name``.
     """
+
     try:
         v6 = dns.ipv6.inet_aton(text)
         if dns.ipv6.is_mapped(v6):
-            if sys.version_info >= (3,):
-                parts = ['%d' % byte for byte in v6[12:]]
-            else:
-                parts = ['%d' % ord(byte) for byte in v6[12:]]
-            origin = ipv4_reverse_domain
+            parts = ['%d' % byte for byte in v6[12:]]
+            origin = v4_origin
         else:
             parts = [x for x in str(binascii.hexlify(v6).decode())]
-            origin = ipv6_reverse_domain
-    except:
+            origin = v6_origin
+    except Exception:
         parts = ['%d' %
-                 byte for byte in bytearray(dns.ipv4.inet_aton(text))]
-        origin = ipv4_reverse_domain
-    parts.reverse()
-    return dns.name.from_text('.'.join(parts), origin=origin)
+                 byte for byte in dns.ipv4.inet_aton(text)]
+        origin = v4_origin
+    return dns.name.from_text('.'.join(reversed(parts)), origin=origin)
 
 
-def to_address(name):
+def to_address(name, v4_origin=ipv4_reverse_domain,
+               v6_origin=ipv6_reverse_domain):
     """Convert a reverse map domain name into textual address form.
-    @param name: an IPv4 or IPv6 address in reverse-map form.
-    @type name: dns.name.Name object
-    @rtype: str
+
+    *name*, a ``dns.name.Name``, an IPv4 or IPv6 address in reverse-map name
+    form.
+
+    *v4_origin*, a ``dns.name.Name`` representing the top-level domain for
+    IPv4 addresses, instead of the default (in-addr.arpa.)
+
+    *v6_origin*, a ``dns.name.Name`` representing the top-level domain for
+    IPv4 addresses, instead of the default (ip6.arpa.)
+
+    Raises ``dns.exception.SyntaxError`` if the name does not have a
+    reverse-map form.
+
+    Returns a ``str``.
     """
-    if name.is_subdomain(ipv4_reverse_domain):
-        name = name.relativize(ipv4_reverse_domain)
-        labels = list(name.labels)
-        labels.reverse()
-        text = b'.'.join(labels)
-        # run through inet_aton() to check syntax and make pretty.
+
+    if name.is_subdomain(v4_origin):
+        name = name.relativize(v4_origin)
+        text = b'.'.join(reversed(name.labels))
+        # run through inet_ntoa() to check syntax and make pretty.
         return dns.ipv4.inet_ntoa(dns.ipv4.inet_aton(text))
-    elif name.is_subdomain(ipv6_reverse_domain):
-        name = name.relativize(ipv6_reverse_domain)
-        labels = list(name.labels)
-        labels.reverse()
+    elif name.is_subdomain(v6_origin):
+        name = name.relativize(v6_origin)
+        labels = list(reversed(name.labels))
         parts = []
-        i = 0
-        l = len(labels)
-        while i < l:
+        for i in range(0, len(labels), 4):
             parts.append(b''.join(labels[i:i + 4]))
-            i += 4
         text = b':'.join(parts)
-        # run through inet_aton() to check syntax and make pretty.
+        # run through inet_ntoa() to check syntax and make pretty.
         return dns.ipv6.inet_ntoa(dns.ipv6.inet_aton(text))
     else:
         raise dns.exception.SyntaxError('unknown reverse-map address family')