Clarify pynetinit.c, runtime build directives

vmuriart · vmuriart · commit eb9465a5121b · 2017-02-03T17:47:55.000-07:00
pynetinit.c:
Clarifiy its intent is for PY3

runtime.cs
Remove unnecessary check for System.Text
Simplifies import section
diff --git a/src/monoclr/pynetinit.c b/src/monoclr/pynetinit.c
@@ -135,7 +135,7 @@ void main_thread_handler(gpointer user_data)
     int ii = 0;
     for (ii = 0; ii < PyList_Size(syspath); ++ii)
     {
-#if PY_MAJOR_VERSION > 2
+#if PY_MAJOR_VERSION >= 3
         Py_ssize_t wlen;
         wchar_t *wstr = PyUnicode_AsWideCharString(PyList_GetItem(syspath, ii), &wlen);
         char *pydir = (char*)malloc(wlen + 1);
@@ -150,7 +150,7 @@ void main_thread_handler(gpointer user_data)
         strncpy(curdir, strlen(pydir) > 0 ? pydir : ".", 1024);
         strncat(curdir, slash, 1024);
 
-#if PY_MAJOR_VERSION > 2
+#if PY_MAJOR_VERSION >= 3
         free(pydir);
 #endif
 
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
-#if UCS4
 using System.Text;
+
+#if UCS4
 using Mono.Unix;
-#elif UCS2 && PYTHON3
-using System.Text;
 #endif
 
 namespace Python.Runtime
