Use backport of ipaddress for Python 2 instead of ipaddr

Author: akissa

README.rst

@@ -83,7 +83,7 @@ Requirements
 This code requires Python 2.6+ or 3.3+. The C extension requires CPython. The
 pure Python implementation has been tested with PyPy.
 
-On Python 2, the `ipaddr module <https://code.google.com/p/ipaddr-py/>`_ is
+On Python 2, the `ipaddress module <https://pypi.python.org/pypi/ipaddress>`_ is
 required.
 
 Versioning

maxminddb/compat.py

@@ -3,9 +3,6 @@
 # pylint: skip-file
 
 if sys.version_info[0] == 2:
-    import ipaddr as ipaddress  # pylint:disable=F0401
-    ipaddress.ip_address = ipaddress.IPAddress
-
     int_from_byte = ord
 
     FileNotFoundError = IOError
@@ -17,8 +14,6 @@ def int_from_bytes(b):
 
     byte_from_int = chr
 else:
-    import ipaddress  # pylint:disable=F0401
-
     int_from_byte = lambda x: x
 
     FileNotFoundError = FileNotFoundError

maxminddb/reader.py

@@ -14,8 +14,9 @@
     mmap = None
 
 import struct
+import ipaddress
 
-from maxminddb.compat import byte_from_int, int_from_byte, ipaddress
+from maxminddb.compat import byte_from_int, int_from_byte
 from maxminddb.const import MODE_AUTO, MODE_MMAP, MODE_FILE, MODE_MEMORY
 from maxminddb.decoder import Decoder
 from maxminddb.errors import InvalidDatabaseError

setup.py

@@ -22,7 +22,7 @@
 
 if sys.version_info[0] == 2 or (sys.version_info[0] == 3
                                 and sys.version_info[1] < 3):
-    requirements.append('ipaddr')
+    requirements.append('ipaddress')
 
 compile_args = ['-Wall', '-Wextra']