Skip to content

Binary substitution of Python.Runtime.dll becomes safe. #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 10, 2017
Merged

Binary substitution of Python.Runtime.dll becomes safe. #456

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9429512
Binary substitution of Python.Runtime.Dll becomes safe.
Apr 25, 2017
49edf48
Build fix, lost renames performed.
Apr 25, 2017
938030c
typo fix.
Apr 25, 2017
0240461
Merged latest master
Jul 5, 2017
2d2fe53
Public constants replacement fixes.
Jul 5, 2017
633a636
Merge
Jul 10, 2017
77b49a2
Static readonly fields (related to build depented values) replaced by…
Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Public constants replacement fixes.
  • Loading branch information
dse committed Jul 5, 2017
commit 2d2fe535b181a75fb7fc36adcded8264499e1108
36 changes: 18 additions & 18 deletions src/runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public class Runtime
/// </summary>
private const string PyUnicodeEntryPoint = "PyUnicodeUCS4_";
#elif UCS2
public const int _UCS = 2;
internal const int _UCS = 2;

/// <summary>
/// EntryPoint to be used in DllImport to map to correct Unicode
Expand All @@ -110,33 +110,33 @@ public class Runtime
// We needs to replace all public constants to static readonly fields to allow
// binary substitution of different Python.Runtime.dll builds in a target application.

public const string pyversion = _pyversion;
public const string pyver = _pyver;
public readonly string pyversion = _pyversion;
public readonly string pyver = _pyver;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two too.


#if PYTHON27
internal const string _pyversion = "2.7";
internal const string _pyver = "27";
#elif PYTHON33
public const string _pyversion = "3.3";
public const string _pyver = "33";
internal const string _pyversion = "3.3";
internal const string _pyver = "33";
#elif PYTHON34
public const string _pyversion = "3.4";
public const string _pyver = "34";
internal const string _pyversion = "3.4";
internal const string _pyver = "34";
#elif PYTHON35
public const string _pyversion = "3.5";
public const string _pyver = "35";
internal const string _pyversion = "3.5";
internal const string _pyver = "35";
#elif PYTHON36
public const string _pyversion = "3.6";
public const string _pyver = "36";
internal const string _pyversion = "3.6";
internal const string _pyver = "36";
#elif PYTHON37 // TODO: Add `interop37.cs` after PY37 is released
public const string _pyversion = "3.7";
public const string _pyver = "37";
internal const string _pyversion = "3.7";
internal const string _pyver = "37";
#else
#error You must define one of PYTHON33 to PYTHON37 or PYTHON27
#endif

#if MONO_LINUX || MONO_OSX // Linux/macOS use dotted version string
internal const string dllBase = "python" + pyversion;
internal const string dllBase = "python" + _pyversion;
#else // Windows
internal const string dllBase = "python" + _pyver;
#endif
Expand All @@ -159,9 +159,9 @@ public class Runtime
public static readonly string PythonDLL = _PythonDll;

#if PYTHON_WITHOUT_ENABLE_SHARED
public const string _PythonDll = "__Internal";
internal const string _PythonDll = "__Internal";
#else
public const string _PythonDll = dllBase + dllWithPyDebug + dllWithPyMalloc;
internal const string _PythonDll = dllBase + dllWithPyDebug + dllWithPyMalloc;
#endif

public static readonly int pyversionnumber = Convert.ToInt32(_pyver);
Expand Down Expand Up @@ -708,7 +708,7 @@ public static extern int Py_Main(
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
internal static extern IntPtr PyEval_EvalCode(IntPtr co, IntPtr globals, IntPtr locals);

[DllImport(PythonDll, CallingConvention = CallingConvention.Cdecl)]
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
internal static extern IntPtr Py_CompileString(string code, string file, IntPtr tok);

[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
Expand Down Expand Up @@ -1224,7 +1224,7 @@ int size

internal static IntPtr PyUnicode_FromUnicode(string s, int size)
{
return PyUnicode_FromKindAndData(UCS, s, size);
return PyUnicode_FromKindAndData(_UCS, s, size);
}

[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
Expand Down