Rename internal StrMarshaler to UcsMarshaler

vmuriart · vmuriart · commit ffe64486b42a · 2017-03-02T15:05:50.000-07:00
To clarify that this is meant to be applied on Unicode type IntPtr and not strings like ones.
Made Marshalers internal, don't see a reason to expose it.
diff --git a/src/runtime/CustomMarshaler.cs b/src/runtime/CustomMarshaler.cs
@@ -9,7 +9,7 @@ namespace Python.Runtime
     /// Abstract class defining boiler plate methods that
     /// Custom Marshalers will use.
     /// </summary>
-    public abstract class MarshalerBase : ICustomMarshaler
+    internal abstract class MarshalerBase : ICustomMarshaler
     {
         public object MarshalNativeToManaged(IntPtr pNativeData)
         {
@@ -39,9 +39,9 @@ public int GetNativeDataSize()
     /// Custom Marshaler to deal with Managed String to Native
     /// conversion differences on UCS2/UCS4.
     /// </summary>
-    public class StrMarshaler : MarshalerBase
+    internal class UcsMarshaler : MarshalerBase
     {
-        private static readonly MarshalerBase Instance = new StrMarshaler();
+        private static readonly MarshalerBase Instance = new UcsMarshaler();
         private static readonly Encoding PyEncoding = Runtime.PyEncoding;
 
         public override IntPtr MarshalManagedToNative(object managedObj)
@@ -106,7 +106,7 @@ public static int GetUnicodeByteLength(IntPtr p)
     /// Custom Marshaler to deal with Managed String Arrays to Native
     /// conversion differences on UCS2/UCS4.
     /// </summary>
-    public class StrArrayMarshaler : MarshalerBase
+    internal class StrArrayMarshaler : MarshalerBase
     {
         private static readonly MarshalerBase Instance = new StrArrayMarshaler();
         private static readonly Encoding PyEncoding = Runtime.PyEncoding;
@@ -161,7 +161,7 @@ public static ICustomMarshaler GetInstance(string cookie)
     /// If instead we used `MarshalAs(UnmanagedType.LPWStr)` the output to
     /// `foo` would be `f\x00o\x00o\x00`.
     /// </remarks>
-    public class Utf8Marshaler : MarshalerBase
+    internal class Utf8Marshaler : MarshalerBase
     {
         private static readonly MarshalerBase Instance = new Utf8Marshaler();
         private static readonly Encoding PyEncoding = Encoding.UTF8;
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -59,7 +59,7 @@ public static string ProgramName
             {
                 IntPtr p = Runtime.Py_GetProgramName();
                 string result = Runtime.IsPython3
-                    ? StrMarshaler.PtrToStringUni(p)
+                    ? UcsMarshaler.PtrToStringUni(p)
                     : Marshal.PtrToStringAnsi(p);
 
                 return result ?? "";
@@ -73,7 +73,7 @@ public static string PythonHome
             {
                 IntPtr p = Runtime.Py_GetPythonHome();
                 string result = Runtime.IsPython3
-                    ? StrMarshaler.PtrToStringUni(p)
+                    ? UcsMarshaler.PtrToStringUni(p)
                     : Marshal.PtrToStringAnsi(p);
 
                 return result ?? "";
@@ -87,7 +87,7 @@ public static string PythonPath
             {
                 IntPtr p = Runtime.Py_GetPath();
                 string result = Runtime.IsPython3
-                    ? StrMarshaler.PtrToStringUni(p)
+                    ? UcsMarshaler.PtrToStringUni(p)
                     : Marshal.PtrToStringAnsi(p);
 
                 return result ?? "";
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1239,7 +1239,7 @@ internal static bool PyUnicode_Check(IntPtr ob)
         [DllImport(PythonDll)]
         internal static extern IntPtr PyUnicode_FromKindAndData(
             int kind,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StrMarshaler))] string s,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(UcsMarshaler))] string s,
             int size
         );
 
@@ -1265,7 +1265,7 @@ internal static IntPtr PyUnicode_FromUnicode(string s, int size)
 
         [DllImport(PythonDll, EntryPoint = PyUnicodeEntryPoint + "FromUnicode")]
         internal static extern IntPtr PyUnicode_FromUnicode(
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StrMarshaler))] string s,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(UcsMarshaler))] string s,
             int size
         );
 
