Remove PYTHON_WITH_WIDE_UNICODE flag

vmuriart · vmuriart · commit 8fba05195606 · 2017-03-03T12:56:22.000-07:00
ABIFlags were introduced in PY32, and --with_wide_unicode was removed in PY33. https://docs.python.org/3/whatsnew/3.3.html#functionality Closes #417
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Upgraded NUnit framework from `2.6.4` to `3.6.0` (#371)
 -   Unfroze Mono version on Travis (#345)
 -   Changed `conda.recipe` build to only pull-requests (#345)
+-   Combine `Py_DEBUG` and `PYTHON_WITH_PYDEBUG` flags (#362)
 
 ### Deprecated
 
@@ -63,6 +64,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Removed `six` dependency for `unittests` (#329)
 -   Removed `Mono.Unix` dependency for `UCS4` (#360)
 -   Removed need for `Python.Runtime.dll.config`
+-   Removed PY32 build option `PYTHON_WITH_WIDE_UNICODE` (#417)
 
 ## [2.2.2][] - 2017-01-29
 
diff --git a/setup.py b/setup.py
@@ -182,8 +182,6 @@ def build_extension(self, ext):
                 defines.append("PYTHON_WITH_PYDEBUG")
             if "m" in sys.abiflags:
                 defines.append("PYTHON_WITH_PYMALLOC")
-            if "u" in sys.abiflags:
-                defines.append("PYTHON_WITH_WIDE_UNICODE")
 
         # check the interop file exists, and create it if it doesn't
         interop_file = _get_interop_filename()
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -138,16 +138,11 @@ public class Runtime
 #else
         internal const string dllWithPyMalloc = "";
 #endif
-#if PYTHON_WITH_WIDE_UNICODE
-        internal const string dllWithWideUnicode = "u";
-#else
-        internal const string dllWithWideUnicode = "";
-#endif
 
 #if PYTHON_WITHOUT_ENABLE_SHARED
         public const string PythonDll = "__Internal";
 #else
-        public const string PythonDll = dllBase + dllWithPyDebug + dllWithPyMalloc + dllWithWideUnicode;
+        public const string PythonDll = dllBase + dllWithPyDebug + dllWithPyMalloc;
 #endif
 
         public static readonly int pyversionnumber = Convert.ToInt32(pyver);
