Reenabled set_charset/charset on Python 3

Author: oschwald

py_GeoIP.c

@@ -501,10 +501,10 @@ 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));
 }
 
@@ -515,10 +515,15 @@ static PyObject *GeoIP_set_charset_Py(PyObject * self, PyObject * args)
     if (!PyArg_ParseTuple(args, "i", &charset)) {
         return NULL;
     }
+#if PY_MAJOR_VERSION >= 3
+    if (charset != GEOIP_CHARSET_UTF8) {
+        PyErr_SetString(PyExc_ValueError,
+                        "Only UTF-8 is supported for Python 3+.");
+        return NULL;
+    }
+#endif
     return Py_BuildValue("i", GeoIP_set_charset(GeoIP->gi, charset));
-
 }
-#endif
 
 static PyObject *GeoIP_last_netmask_Py(PyObject * self, PyObject *UNUSED(args))
 {
@@ -609,12 +614,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 )" },
     { "set_charset",             GeoIP_set_charset_Py,             METH_VARARGS,
       "Set the charset for city records" },
-#endif
     { "last_netmask",            GeoIP_last_netmask_Py,            METH_NOARGS,
       "Return the netmask depth of the last lookup" },
     { "country_code_by_name_v6", GeoIP_country_code_by_name_v6_Py, METH_VARARGS,

tests/test_errors.py

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