Merge remote-tracking branch 'gl/dgobbi/python-toupper-macro' into release-6.3

* gl/dgobbi/python-toupper-macro:
  Remove the toupper macro defined by Python.h.

Utilities/Python/vtkPython.h

@@ -91,4 +91,15 @@ they are system headers.  Do NOT add any #undef lines here.  */
 # undef VTK_PYTHON_UNDEF_DEBUG
 #endif
 
+/* undo some macro defs in pyport.h */
+#if defined(_PY_PORT_CTYPE_UTF8_ISSUE) && defined(__cplusplus)
+#undef isalnum
+#undef isalpha
+#undef islower
+#undef isspace
+#undef isupper
+#undef tolower
+#undef toupper
+#endif
+
 #endif