[patch] ipaddress.patch

ipaddress.patch (text/plain), 972 bytes, created by Robert Trace on 2015-09-02 01:25:26 UTC

diff -Naur pyspf-2.0.11-orig/spf.py pyspf-2.0.11/spf.py
--- pyspf-2.0.11-orig/spf.py	2014-12-05 17:20:07.000000000 +0100
+++ pyspf-2.0.11/spf.py	2015-07-28 10:57:43.845717844 +0200
@@ -401,6 +401,9 @@
             self.iplist = []
             ip6 = True
         else:
+            if sys.version_info.major < 3:
+                if isinstance(i, str):
+                   i = i.decode('ascii')
             try:
                 self.ipaddr = ipaddress.ip_address(i)
             except AttributeError:
@@ -1345,6 +1348,11 @@
         True
         """
         try:
+            if sys.version_info.major < 3:
+                for idx, ip in enumerate(ipaddrs):
+                    if isinstance(ipaddrs[idx], str):
+                        ipaddrs[idx] = ipaddrs[idx].decode('ascii')
+
             for netwrk in [ipaddress.ip_network(ip) for ip in ipaddrs]:
                 network = netwrk.supernet(new_prefix=n)
                 if isinstance(self.iplist, bool):