replaced ipaddr with ipaddress.py (backported from py3)

maxslimmer · Dec 3, 2016 · 637579f · 637579f
1 parent 0b8ecea
commit 637579f
Show file tree

Hide file tree

Showing 5 changed files with 2,434 additions and 1,936 deletions.
diff --git a/gluon/_compat.py b/gluon/_compat.py
@@ -32,6 +32,7 @@
     import cgi
     import cookielib
     from xmlrpclib import ProtocolError
+    from gluon.contrib import ipaddress
     BytesIO = StringIO
     reduce = reduce
     hashlib_md5 = hashlib.md5
@@ -97,6 +98,7 @@ def to_native(obj, charset='utf8', errors='strict'):
     from http import cookiejar as cookielib
     from xmlrpc.client import ProtocolError
     import html # warning, this is the python3 module and not the web2py html module
+    import ipaddress
     hashlib_md5 = lambda s: hashlib.md5(bytes(s, 'utf8'))
     iterkeys = lambda d: iter(d.keys())
     itervalues = lambda d: iter(d.values())