Refactored to keep the current string-only behavior on Python 3

Author: akissa

maxminddb/compat.py

@@ -1,8 +1,15 @@
 import sys
 
+import ipaddress
+
 # pylint: skip-file
 
 if sys.version_info[0] == 2:
+    def compat_ip_address(address):
+        if isinstance(address, bytes):
+            address = address.decode()
+        return ipaddress.ip_address(address)
+
     int_from_byte = ord
 
     FileNotFoundError = IOError
@@ -14,6 +21,9 @@ def int_from_bytes(b):
 
     byte_from_int = chr
 else:
+    def compat_ip_address(address):
+        return ipaddress.ip_address(address)
+
     int_from_byte = lambda x: x
 
     FileNotFoundError = FileNotFoundError

maxminddb/reader.py

@@ -14,9 +14,8 @@
     mmap = None
 
 import struct
-import ipaddress
 
-from maxminddb.compat import byte_from_int, int_from_byte
+from maxminddb.compat import byte_from_int, int_from_byte, compat_ip_address
 from maxminddb.const import MODE_AUTO, MODE_MMAP, MODE_FILE, MODE_MEMORY
 from maxminddb.decoder import Decoder
 from maxminddb.errors import InvalidDatabaseError
@@ -47,7 +46,6 @@ def __init__(self, database, mode=MODE_AUTO):
             * MODE_MEMORY - load database into memory.
             * MODE_AUTO - tries MODE_MMAP and then MODE_FILE. Default.
         """
-        # pylint: disable=redefined-variable-type
         if (mode == MODE_AUTO and mmap) or mode == MODE_MMAP:
             with open(database, 'rb') as db_file:
                 self._buffer = mmap.mmap(
@@ -95,10 +93,8 @@ def get(self, ip_address):
         Arguments:
         ip_address -- an IP address in the standard string notation
         """
-        if isinstance(ip_address, bytes):
-            ip_address = ip_address.decode()
 
-        address = ipaddress.ip_address(ip_address)
+        address = compat_ip_address(ip_address)
 
         if address.version == 6 and self._metadata.ip_version == 4:
             raise ValueError('Error looking up {0}. You attempted to look up '