Updated python 3 support; updated version number

Author: MelindaShore

context.c

@@ -1313,7 +1313,11 @@ context_get_attributes(getdns_ContextObject *self, PyObject *unused)
     PyObject *py_attr_list = PyList_New(NSETTERS);
 
     for (i = 0 ; i < NSETTERS ; i++)  {
+#if PY_MAJOR_VERSION >= 3
+        (void)PyList_SetItem(py_attr_list, (Py_ssize_t) i, PyUnicode_FromString(setters[i].name));        
+#else
         (void)PyList_SetItem(py_attr_list, (Py_ssize_t) i, PyString_FromString(setters[i].name));
+#endif
     }
     return py_attr_list;
 }

pygetdns.h

@@ -32,7 +32,7 @@
 #ifndef PYGETDNS_H
 #define PYGETDNS_H
 
-#define PYGETDNS_VERSION "0.4.1"
+#define PYGETDNS_VERSION "0.5.0"
 #define GETDNS_DOCSTRING "getdns bindings for Python (see http://www.getdnsapi.net)"
 
 #define GETDNS_STR_IPV4 "IPv4"

pygetdns_util.c

@@ -385,12 +385,21 @@ getdnsify_addressdict(PyObject *pydict)
         getdns_dict_set_bindata(addr_dict, "scope_id", &scope_id);
     }
     if ((str = PyDict_GetItemString(pydict, "tls_port")) != NULL)  {
+#if PY_MAJOR_VERSION >= 3
+        if (!PyLong_Check(str))  {
+            PyErr_SetString(getdns_error, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
+            return NULL;
+        }
+        tls_port = (uint32_t)PyLong_AsLong(str);
+        getdns_dict_set_int(addr_dict, "tls_port", tls_port);
+#else
         if (!PyInt_Check(str))  {
             PyErr_SetString(getdns_error, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
             return NULL;
         }
         tls_port = (uint32_t)PyInt_AsLong(str);
         getdns_dict_set_int(addr_dict, "tls_port", tls_port);
+#endif
     }
 
     if ((str = PyDict_GetItemString(pydict, "address_type")) == NULL)  {

setup.py

@@ -65,7 +65,7 @@
                     )
 
 setup(name='getdns',
-      version='0.4.1',
+      version='0.5.0',
       description='getdns Python bindings for getdns',
       long_description=long_description,
       license='BSD',