NotificationsYou must be signed in to change notification settings
Fork752
Star5.1k

Commita406d50

committed

Drop OperatingSystemName from the interface as well

1 parenta7949b9 commita406d50Copy full SHA for a406d50

File tree

2 files changed

-11

lines changed

src
- embed_tests
  - TestRuntime.cs
- runtime
  - runtime.cs

2 files changed

-11

lines changed

`‎src/embed_tests/TestRuntime.cs`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ public static void PlatformCache()`
`30`	`30`
`31`	`31`	`Assert.That(Runtime.Runtime.Machine,Is.Not.EqualTo(MachineType.Other));`
`32`	`32`	`Assert.That(Runtime.Runtime.OperatingSystem,Is.Not.EqualTo(OperatingSystemType.Other));`
`33`		`-Assert.That(!string.IsNullOrEmpty(Runtime.Runtime.OperatingSystemName));`
`34`	`33`
`35`	`34`	`// Don't shut down the runtime: if the python engine was initialized`
`36`	`35`	`// but not shut down by another test, we'd end up in a bad state.`

`‎src/runtime/runtime.cs`

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,12 +123,6 @@ public class Runtime`
`123`	`123`	`/// </summary>`
`124`	`124`	`publicstaticOperatingSystemTypeOperatingSystem{get;privateset;}`
`125`	`125`
`126`		`-/// <summary>`
`127`		`-/// Gets the operating system as reported by python's platform.system().`
`128`		`-/// </summary>`
`129`		`-publicstaticstringOperatingSystemName{get;privateset;}`
`130`		`-`
`131`		`-`
`132`	`126`	`/// <summary>`
`133`	`127`	`/// Map lower-case version of the python machine name to the processor`
`134`	`128`	`/// type. There are aliases, e.g. x86_64 and amd64 are two names for`
`@@ -359,7 +353,7 @@ private static void InitializePlatformData()`
`359`	`353`
`360`	`354`	`fn=PyObject_GetAttrString(platformModule,"system");`
`361`	`355`	`op=PyObject_Call(fn,emptyTuple,IntPtr.Zero);`
`362`		`-OperatingSystemName=GetManagedString(op);`
	`356`	`+stringoperatingSystemName=GetManagedString(op);`
`363`	`357`	`XDecref(op);`
`364`	`358`	`XDecref(fn);`
`365`	`359`
`@@ -375,7 +369,7 @@ private static void InitializePlatformData()`
`375`	`369`	`// Now convert the strings into enum values so we can do switch`
`376`	`370`	`// statements rather than constant parsing.`
`377`	`371`	`OperatingSystemTypeOSType;`
`378`		`-if(!OperatingSystemTypeMapping.TryGetValue(OperatingSystemName,outOSType))`
	`372`	`+if(!OperatingSystemTypeMapping.TryGetValue(operatingSystemName,outOSType))`
`379`	`373`	`{`
`380`	`374`	`OSType=OperatingSystemType.Other;`
`381`	`375`	`}`
`@@ -388,14 +382,15 @@ private static void InitializePlatformData()`
`388`	`382`	`}`
`389`	`383`	`Machine=MType;`
`390`	`384`	`#else`
`391`		`-OperatingSystem=OperatingSystemType.Other;`
`392`	`385`	`if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`393`	`386`	`OperatingSystem=OperatingSystemType.Linux;`
`394`	`387`	`elseif(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
`395`	`388`	`OperatingSystem=OperatingSystemType.Darwin;`
`396`	`389`	`elseif(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`397`	`390`	`OperatingSystem=OperatingSystemType.Windows;`
`398`		`-`
	`391`	`+else`
	`392`	`+OperatingSystem=OperatingSystemType.Other;`
	`393`	`+`
`399`	`394`	`switch(RuntimeInformation.ProcessArchitecture)`
`400`	`395`	`{`
`401`	`396`	`caseArchitecture.X86:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita406d50

File tree

2 files changed

2 files changed

`‎src/embed_tests/TestRuntime.cs`

`‎src/runtime/runtime.cs`

0 commit comments