Drop OperatingSystemName from the interface as well

filmor · filmor · commit c6ae15b6cb71 · 2020-05-15T19:53:43.000+02:00
diff --git a/src/embed_tests/TestRuntime.cs b/src/embed_tests/TestRuntime.cs
@@ -30,7 +30,6 @@ public static void PlatformCache()
 
             Assert.That(Runtime.Runtime.Machine, Is.Not.EqualTo(MachineType.Other));
             Assert.That(Runtime.Runtime.OperatingSystem, Is.Not.EqualTo(OperatingSystemType.Other));
-            Assert.That(!string.IsNullOrEmpty(Runtime.Runtime.OperatingSystemName));
 
             // Don't shut down the runtime: if the python engine was initialized
             // but not shut down by another test, we'd end up in a bad state.
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -123,12 +123,6 @@ public class Runtime
         /// </summary>
         public static OperatingSystemType OperatingSystem { get; private set; }
 
-        /// <summary>
-        /// Gets the operating system as reported by python's platform.system().
-        /// </summary>
-        public static string OperatingSystemName { get; private set; }
-
-
         /// <summary>
         /// Map lower-case version of the python machine name to the processor
         /// type. There are aliases, e.g. x86_64 and amd64 are two names for
@@ -359,7 +353,7 @@ private static void InitializePlatformData()
 
             fn = PyObject_GetAttrString(platformModule, "system");
             op = PyObject_Call(fn, emptyTuple, IntPtr.Zero);
-            OperatingSystemName = GetManagedString(op);
+            string operatingSystemName = GetManagedString(op);
             XDecref(op);
             XDecref(fn);
 
@@ -375,7 +369,7 @@ private static void InitializePlatformData()
             // Now convert the strings into enum values so we can do switch
             // statements rather than constant parsing.
             OperatingSystemType OSType;
-            if (!OperatingSystemTypeMapping.TryGetValue(OperatingSystemName, out OSType))
+            if (!OperatingSystemTypeMapping.TryGetValue(operatingSystemName, out OSType))
             {
                 OSType = OperatingSystemType.Other;
             }
@@ -388,14 +382,15 @@ private static void InitializePlatformData()
             }
             Machine = MType;
 #else
-            OperatingSystem = OperatingSystemType.Other;
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 OperatingSystem = OperatingSystemType.Linux;
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 OperatingSystem = OperatingSystemType.Darwin;
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 OperatingSystem = OperatingSystemType.Windows;
-            
+            else
+                OperatingSystem = OperatingSystemType.Other;
+
             switch (RuntimeInformation.ProcessArchitecture)
             {
                 case Architecture.X86:
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -625,7 +625,7 @@ int MAP_ANONYMOUS
                         case OperatingSystemType.Linux:
                             return 0x20;
                         default:
-                            throw new NotImplementedException($"mmap is not supported on {Runtime.OperatingSystemName}");
+                            throw new NotImplementedException($"mmap is not supported on this operating system");
                     }
                 }
             }
@@ -659,7 +659,7 @@ internal static IMemoryMapper CreateMemoryMapper()
                 case OperatingSystemType.Windows:
                     return new WindowsMemoryMapper();
                 default:
-                    throw new NotImplementedException($"No support for {Runtime.OperatingSystemName}");
+                    throw new NotImplementedException($"No support for this operating system");
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ int MAP_ANONYMOUS`
`625`	`625`	`case OperatingSystemType.Linux:`
`626`	`626`	`return 0x20;`
`627`	`627`	`default:`
`628`		`- throw new NotImplementedException($"mmap is not supported on {Runtime.OperatingSystemName}");`
	`628`	`+ throw new NotImplementedException($"mmap is not supported on this operating system");`
`629`	`629`	`}`
`630`	`630`	`}`
`631`	`631`	`}`
`@@ -659,7 +659,7 @@ internal static IMemoryMapper CreateMemoryMapper()`
`659`	`659`	`case OperatingSystemType.Windows:`
`660`	`660`	`return new WindowsMemoryMapper();`
`661`	`661`	`default:`
`662`		`- throw new NotImplementedException($"No support for {Runtime.OperatingSystemName}");`
	`662`	`+ throw new NotImplementedException($"No support for this operating system");`
`663`	`663`	`}`
`664`	`664`	`}`
`665`	`665`