Commitf2e6f6f

authored and

committed

Add function to set Py_NoSiteFlag global variable to 1 (pythonnet#971)

* Add function to set Py_NoSiteFlag global variable to 1.* Add myself to authors, update changelog.

1 parent4a9457f commitf2e6f6fCopy full SHA for f2e6f6f

File tree

+38

-0

lines changed

+38

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`
`13`	`13`	`##Contributors`
`14`	`14`
	`15`	`+- Alex Helms ([@alexhelms](https://github.com/alexhelms))`
`15`	`16`	`- Alexandre Catarino([@AlexCatarino](https://github.com/AlexCatarino))`
`16`	`17`	`- Arvid JB ([@ArvidJB](https://github.com/ArvidJB))`
`17`	`18`	`- Benoît Hudson ([@benoithudson](https://github.com/benoithudson))`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].`
`10`	`10`	`###Added`
`11`	`11`
`12`	`12`	`- Added automatic NuGet package generation in appveyor and local builds`
	`13`	`+- Added function that sets Py_NoSiteFlag to 1.`
`13`	`14`
`14`	`15`	`###Changed`
`15`	`16`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,16 @@ public static string Compiler`
`130`	`130`	`get{returnMarshal.PtrToStringAnsi(Runtime.Py_GetCompiler());}`
`131`	`131`	`}`
`132`	`132`
	`133`	`+/// <summary>`
	`134`	`+/// Set the NoSiteFlag to disable loading the site module.`
	`135`	`+/// Must be called before Initialize.`
	`136`	`+/// https://docs.python.org/3/c-api/init.html#c.Py_NoSiteFlag`
	`137`	`+/// </summary>`
	`138`	`+publicstaticvoidSetNoSiteFlag()`
	`139`	`+{`
	`140`	`+Runtime.SetNoSiteFlag();`
	`141`	`+}`
	`142`	`+`
`133`	`143`	`publicstaticintRunSimpleString(stringcode)`
`134`	`144`	`{`
`135`	`145`	`returnRuntime.PyRun_SimpleString(code);`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -414,6 +414,8 @@ internal static int AtExit()`
`414`	`414`	`internalstaticIntPtrPyNoneType;`
`415`	`415`	`internalstaticIntPtrPyTypeType;`
`416`	`416`
	`417`	`+internalstaticIntPtrPy_NoSiteFlag;`
	`418`	`+`
`417`	`419`	`#ifPYTHON3`
`418`	`420`	`internalstaticIntPtrPyBytesType;`
`419`	`421`	`#endif`
`@@ -1884,5 +1886,29 @@ internal static IntPtr PyMem_Realloc(IntPtr ptr, long size)`
`1884`	`1886`
`1885`	`1887`	`[DllImport(_PythonDll, CallingConvention= CallingConvention.Cdecl)]`
`1886`	`1888`	`internalstaticexternint Py_MakePendingCalls();`
	`1889`	`+`
	`1890`	`+ internalstaticvoid SetNoSiteFlag()`
	`1891`	`+{`
	`1892`	`+ var loader= LibraryLoader.Get(OperatingSystem);`
	`1893`	`+`
	`1894`	`+ IntPtr dllLocal;`
	`1895`	`+if(_PythonDll!= "__Internal")`
	`1896`	`+{`
	`1897`	`+ dllLocal= loader.Load(_PythonDll);`
	`1898`	`+}`
	`1899`	`+`
	`1900`	`+try`
	`1901`	`+{`
	`1902`	`+ Py_NoSiteFlag= loader.GetFunction(dllLocal, "Py_NoSiteFlag");`
	`1903`	`+ Marshal.WriteInt32(Py_NoSiteFlag,1);`
	`1904`	`+}`
	`1905`	`+finally`
	`1906`	`+{`
	`1907`	`+if(dllLocal!= IntPtr.Zero)`
	`1908`	`+{`
	`1909`	`+ loader.Free(dllLocal);`
	`1910`	`+}`
	`1911`	`+}`
	`1912`	`+}`
`1887`	`1913`	`}`
`1888`	`1914`	`}`

Comments

(0)