Test and fix for UTF-8 issue on Python 3

Disabled charset and set_charset on Python 3 as those no longer make
much sense since we return the native unicode string.

Author: oschwald

py_GeoIP.c

@@ -85,6 +85,10 @@ GeoIP_GeoIP_init(PyObject *self, PyObject *args, PyObject *kwargs)
         return -1;
     }
 
+#if PY_MAJOR_VERSION >= 3
+    GeoIP_set_charset(GeoIP->gi, GEOIP_CHARSET_UTF8);
+#endif
+
     return 0;
 }
 
@@ -497,11 +501,13 @@ static PyObject *GeoIP_range_by_ip_Py(PyObject * self, PyObject * args)
     return retval;
 }
 
+#if PY_MAJOR_VERSION <= 2
 static PyObject *GeoIP_charset_Py(PyObject *self, PyObject *UNUSED(args))
 {
     GeoIP_GeoIPObject *GeoIP = (GeoIP_GeoIPObject *)self;
     return Py_BuildValue("i", GeoIP_charset(GeoIP->gi));
 }
+#endif
 
 static PyObject *GeoIP_set_charset_Py(PyObject * self, PyObject * args)
 {
@@ -603,8 +609,10 @@ static PyMethodDef GeoIP_GeoIP_methods[] = {
       "Lookup City Region By Name" },
     { "range_by_ip",             GeoIP_range_by_ip_Py,             METH_VARARGS,
       "Lookup start and end IP's for a given IP" },
+#if PY_MAJOR_VERSION <= 2
     { "charset",                 GeoIP_charset_Py,                 METH_NOARGS,
       "Return the current charset ( either GEOIP_CHARSET_ISO_8859_1 or GEOIP_CHARSET_UTF8 )" },
+#endif
     { "set_charset",             GeoIP_set_charset_Py,             METH_VARARGS,
       "Set the charset for city records" },
     { "last_netmask",            GeoIP_last_netmask_Py,            METH_NOARGS,

tests/test_city.py

@@ -24,3 +24,26 @@ def test_city():
     }
 
     assert_equal(gir, record)
+
+
+def test_non_ascii_city():
+    gi = GeoIP.open("tests/data/GeoIPCity.dat", GeoIP.GEOIP_STANDARD)
+
+    gir = gi.record_by_addr("89.92.212.80")
+
+    record = {
+        'city': 'F\xe2ches-thumesnil',
+        'region_name': 'Nord-Pas-de-Calais',
+        'region': 'B4', 'area_code': 0,
+        'time_zone': 'Europe/Paris',
+        'longitude': 3.0808000564575195,
+        'metro_code': 0,
+        'country_code3': 'FRA',
+        'latitude': 50.5906982421875,
+        'postal_code': None,
+        'dma_code': 0,
+        'country_code': 'FR',
+        'country_name': 'France'
+    }
+
+    assert_equal(gir, record)

tests/test_errors.py

@@ -1,3 +1,5 @@
+import sys
+
 import GeoIP
 from nose.tools import assert_equal
 
@@ -35,9 +37,10 @@ def test_errors():
 
     assert_equal(gi.range_by_ip('1.1.1.1'), ('0.0.0.0', '12.87.117.255'))
 
-    assert_equal(gi.charset(), 0)
+    if sys.version_info[0] == 2:
+        assert_equal(gi.charset(), 0)
 
-    assert_equal(gi.set_charset(-1), 0)
+        assert_equal(gi.set_charset(-1), 0)
 
     assert_equal(gi.last_netmask(), 5)