Python3.7 support.

Signed-off-by: David Rebbe <drebbe@intrepidcs.com>

Author: drebbe-intrepid

build_all.bat

@@ -7,20 +7,26 @@ C:\Python33\scripts\pip install wheel twine
 C:\Python34\scripts\pip install wheel twine
 C:\Python35\scripts\pip install wheel twine
 C:\Python36-32\scripts\pip install wheel twine
+C:\Python37-32\scripts\pip install wheel twine
 
 C:\Python27-64\scripts\pip install wheel twine
 C:\Python34-64\scripts\pip install wheel twine
 C:\Python35-64\scripts\pip install wheel twine
+C:\Python36-64\scripts\pip install wheel twine
+C:\Python37-64\scripts\pip install wheel twine
 
 C:\Python27\python setup.py sdist bdist_wheel
 C:\Python33\python setup.py sdist bdist_wheel
 C:\Python34\python setup.py sdist bdist_wheel
 C:\Python35\python setup.py sdist bdist_wheel
 C:\Python36-32\python setup.py sdist bdist_wheel
+C:\Python37-32\python setup.py sdist bdist_wheel
 
 
 C:\Python27-64\python setup.py sdist bdist_wheel
 C:\Python34-64\python setup.py sdist bdist_wheel
 C:\Python35-64\python setup.py sdist bdist_wheel
+C:\Python36-64\python setup.py sdist bdist_wheel
+C:\Python37-64\python setup.py sdist bdist_wheel
 
-C:\Python34\scripts\twine upload dist/* -r pypitest
+REM C:\Python34\scripts\twine upload dist/* -r pypitest

include/defines.h

@@ -6,6 +6,19 @@
 #define MODULE_DESCRIPTION "Copyright Intrepid Control Systems, Inc."
 #define VSPY3_BUILD_VERSION 802
 
+
+// https://bugs.python.org/issue28769
+// 2.x     = char* PyString_AsString(return_value);
+// 3.0-3.6 = char* PyUnicode_AsUTF8(value);
+// 3.7     = const char* PyUnicode_AsUTF8(value);
+#if (PY_MAJOR_VERSION >= 3) && (PY_MINOR_VERSION >= 7)
+#define PyUniStr_AsStrOrUTF8(obj) (char*)PyUnicode_AsUTF8(obj)
+#elif (PY_MAJOR_VERSION >= 3)
+#define PyUniStr_AsStrOrUTF8(obj) PyUnicode_AsUTF8(obj)
+#else
+#define PyStrOrUni_AsStrOrUTF8(obj) PyString_AsString(obj)
+#endif
+
 // Enable use of generic device settings object in 803 or newer.
 #if !defined(USE_GENERIC_DEVICE_SETTINGS) && (VSPY3_BUILD_VERSION >= 803)
 #define USE_GENERIC_DEVICE_SETTINGS

src/exceptions.cpp

@@ -27,11 +27,7 @@ char *pyics_base36enc(int sn)
             Py_DECREF(name);
             return NULL;
         } else {
-#if PY_MAJOR_VERSION >= 3
-            return PyUnicode_AsUTF8(return_value);
-#else
-            return PyString_AsString(return_value);
-#endif
+            PyUniStr_AsStrOrUTF8(return_value);
         }
     }
     Py_DECREF(module);
@@ -90,11 +86,7 @@ PyObject* _set_ics_exception_dev(PyObject* exception, PyObject* obj, char* msg,
     if (obj && PyNeoDevice_CheckExact(obj)) {
         ss << " (";
         // Grab the String "name" out of the NeoDeviceObject
-#if PY_MAJOR_VERSION >= 3
-        char* name = PyUnicode_AsUTF8(PyNeoDevice_GetNeoDevice(obj)->name);
-#else
-        char* name = PyString_AsString(PyNeoDevice_GetNeoDevice(obj)->name);
-#endif
+        char* name = PyUniStr_AsStrOrUTF8(PyNeoDevice_GetNeoDevice(obj)->name);
         if (name) {
             ss << name << " ";
         }

src/methods.cpp

@@ -678,10 +678,10 @@ PyObject* meth_coremini_load(PyObject* self, PyObject* args)
     int data_size = 0;
 #if PY_MAJOR_VERSION >= 3
     if (PyUnicode_CheckExact(arg_data)) {
-        char* file_name = PyUnicode_AsUTF8(arg_data);
+        char* file_name = PyUniStr_AsStrOrUTF8(arg_data);
 #else
     if (PyString_Check(arg_data)) {
-        char* file_name = PyString_AsString(arg_data);
+        char* file_name = PyUniStr_AsStrOrUTF8(arg_data);
 #endif
         if (!file_name) {
             return set_ics_exception_dev(exception_runtime_error(), obj, "Failed to convert file path to string");
@@ -1195,11 +1195,7 @@ PyObject* meth_flash_devices(PyObject* self, PyObject* args)
     PyObject* key, * value;
     while (PyDict_Next(dict, &pos, &key, &value)) {
         unsigned long id = PyLong_AsUnsignedLong(key);
-#if PY_MAJOR_VERSION >= 3
-        char* path = PyUnicode_AsUTF8(value);
-#else
-        char* path = PyString_AsString(value);
-#endif
+        char* path = PyUniStr_AsStrOrUTF8(value);
         if (!path) {
             return NULL;
         }
@@ -3555,10 +3551,10 @@ PyObject* meth_load_readbin(PyObject* self, PyObject* args)
     int data_size = 0;
 #if PY_MAJOR_VERSION >= 3
     if (PyUnicode_CheckExact(arg_data)) {
-        char* file_name = PyUnicode_AsUTF8(arg_data);
+        char* file_name = PyUniStr_AsStrOrUTF8(arg_data);
 #else
     if (PyString_Check(arg_data)) {
-        char* file_name = PyString_AsString(arg_data);
+        char* file_name = PyUniStr_AsStrOrUTF8(arg_data);
 #endif
         if (!file_name) {
             return set_ics_exception_dev(exception_runtime_error(), obj, "Failed to convert file path to string");