Refactor Encoding check

vmuriart · vmuriart · commit 78939c599eec · 2017-02-27T18:58:06.000-07:00
This won't change during runtime.
diff --git a/src/runtime/CustomMarshaler.cs b/src/runtime/CustomMarshaler.cs
@@ -42,7 +42,7 @@ public int GetNativeDataSize()
     public class StrMarshaler : MarshalerBase
     {
         private static readonly MarshalerBase Instance = new StrMarshaler();
-        private static readonly Encoding PyEncoding = Runtime.UCS == 2 ? Encoding.Unicode : Encoding.UTF32;
+        private static readonly Encoding PyEncoding = Runtime.PyEncoding;
 
         public override IntPtr MarshalManagedToNative(object managedObj)
         {
@@ -82,7 +82,7 @@ public static ICustomMarshaler GetInstance(string cookie)
     public class StrArrayMarshaler : MarshalerBase
     {
         private static readonly MarshalerBase Instance = new StrArrayMarshaler();
-        private static readonly Encoding PyEncoding = Runtime.UCS == 2 ? Encoding.Unicode : Encoding.UTF32;
+        private static readonly Encoding PyEncoding = Runtime.PyEncoding;
 
         public override IntPtr MarshalManagedToNative(object managedObj)
         {
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -170,6 +170,11 @@ public class Runtime
         internal static bool IsPython2;
         internal static bool IsPython3;
 
+        /// <summary>
+        /// Encoding to use to convert Unicode to/from Managed to Native
+        /// </summary>
+        internal static readonly Encoding PyEncoding = UCS == 2 ? Encoding.Unicode : Encoding.UTF32;
+
         /// <summary>
         /// Initialize the runtime...
         /// </summary>
@@ -1730,15 +1735,13 @@ internal static string GetManagedString(IntPtr op)
 
             if (type == Runtime.PyUnicodeType)
             {
-                Encoding encoding = UCS == 2 ? Encoding.Unicode : Encoding.UTF32;
-
                 IntPtr p = PyUnicode_AsUnicode(op);
                 int length = PyUnicode_GetSize(op);
 
                 int size = length * UCS;
                 var buffer = new byte[size];
                 Marshal.Copy(p, buffer, 0, size);
-                return encoding.GetString(buffer, 0, size);
+                return PyEncoding.GetString(buffer, 0, size);
             }
 
             return null;

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public int GetNativeDataSize()`
`42`	`42`	`public class StrMarshaler : MarshalerBase`
`43`	`43`	`{`
`44`	`44`	`private static readonly MarshalerBase Instance = new StrMarshaler();`
`45`		`- private static readonly Encoding PyEncoding = Runtime.UCS == 2 ? Encoding.Unicode : Encoding.UTF32;`
	`45`	`+ private static readonly Encoding PyEncoding = Runtime.PyEncoding;`
`46`	`46`
`47`	`47`	`public override IntPtr MarshalManagedToNative(object managedObj)`
`48`	`48`	`{`
`@@ -82,7 +82,7 @@ public static ICustomMarshaler GetInstance(string cookie)`
`82`	`82`	`public class StrArrayMarshaler : MarshalerBase`
`83`	`83`	`{`
`84`	`84`	`private static readonly MarshalerBase Instance = new StrArrayMarshaler();`
`85`		`- private static readonly Encoding PyEncoding = Runtime.UCS == 2 ? Encoding.Unicode : Encoding.UTF32;`
	`85`	`+ private static readonly Encoding PyEncoding = Runtime.PyEncoding;`
`86`	`86`
`87`	`87`	`public override IntPtr MarshalManagedToNative(object managedObj)`
`88`	`88`	`{`