sys.platform cleanup (#705)

Author: slozier

Src/IronPython/Hosting/PythonCommandLine.cs

@@ -43,7 +43,7 @@ public PythonCommandLine() {
         /// because it is intended to be outputted through the Python I/O system.
         /// </summary>
         public static string GetLogoDisplay() {
-            return "IronPython " + PythonContext.GetVersionString() +
+            return "IronPython " + PythonContext.GetVersionString() + " on " + PythonContext.GetPlatform() +
                    "\nType \"help\", \"copyright\", \"credits\" or \"license\" for more information.\n";
         }
 

Src/IronPython/Lib/iptest/test_env.py

@@ -2,39 +2,35 @@
 # The .NET Foundation licenses this file to you under the Apache 2.0 License.
 # See the LICENSE file in the project root for more information.
 
-import sys, os
-#from iptest.util import get_env_var, get_temp_dir
+import os
+import sys
 
 #------------------------------------------------------------------------------
 
 #--IronPython or something else?
-is_cli =         sys.implementation.name == 'ironpython'
+is_cli        =  sys.implementation.name == 'ironpython'
 is_ironpython =  is_cli
-is_cpython    =  not is_ironpython
+is_cpython    =  sys.implementation.name == 'cpython'
 is_windows    =  sys.platform == 'win32'
-is_posix      =  sys.platform == 'posix' or sys.platform == 'linux'
+is_linux      =  sys.platform == 'linux'
 is_osx        =  sys.platform == 'darwin'
+is_posix      =  is_linux or is_osx
+
 is_netcoreapp =  False
 is_netcoreapp21 = False
 is_netcoreapp30 = False
 is_mono = False
-
 if is_ironpython:
-    #We'll use System, if available, to figure out more info on the test
-    #environment later
-    import System
     import clr
     is_netcoreapp = clr.IsNetCoreApp
     is_netcoreapp21 = clr.TargetFramework == ".NETCoreApp,Version=v2.1"
     is_netcoreapp30 = clr.TargetFramework == ".NETCoreApp,Version=v3.0"
-    if is_netcoreapp: clr.AddReference("System.Runtime.Extensions")
-    is_posix = sys.platform == 'posix' or System.Environment.OSVersion.Platform == System.PlatformID.Unix
-    is_osx = os.path.exists('/System/Library/CoreServices/SystemVersion.plist')
     is_mono = clr.IsMono
 
 #--The bittedness of the Python implementation
 is_cli32, is_cli64 = False, False
 if is_ironpython: 
+    import System
     is_cli32, is_cli64 = (System.IntPtr.Size == 4), (System.IntPtr.Size == 8)
 
 is_32, is_64 = is_cli32, is_cli64
@@ -50,6 +46,7 @@
 is_net45Or46 = False
 is_net46 = False
 if is_cli:
+    if is_netcoreapp: clr.AddReference("System.Runtime.Extensions")
     version = System.Environment.Version
     is_net40 = version.Major == 4
     is_net45 = is_net40 and version.Minor == 0 and version.Build == 30319 and version.Revision < 42000
@@ -60,7 +57,6 @@
 if is_ironpython:
     newline = System.Environment.NewLine
 else:
-    import os
     newline = os.linesep
 
 #--Build flavor of Python being tested

Src/IronPython/Modules/sys.cs

@@ -558,16 +558,8 @@ public static void PerformModuleReload(PythonContext/*!*/ context, PythonDiction
             dict["stdin"] = dict["__stdin__"];
             dict["stdout"] = dict["__stdout__"];
             dict["stderr"] = dict["__stderr__"];
-            
-            if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
-                dict["platform"] = "win32";
-            } else if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) {
-                dict["platform"] = "posix";
-            } else if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) {
-                dict["platform"] = "darwin";
-            } else {
-                dict["platform"] = "cli";
-            }
+
+            dict["platform"] = PythonContext.GetPlatform();
 
             // !!! These fields do need to be reset on "reload(sys)". However, the initial value is specified by the 
             // engine elsewhere. For now, we initialize them just once to some default value

Src/IronPython/Runtime/PythonContext.cs

@@ -1782,6 +1782,18 @@ private void SetVersionVariables(PythonDictionary dict) {
             dict["version"] = _initialVersionString ?? GetVersionString();
         }
 
+        internal static string GetPlatform() {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+                return "win32";
+            } else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) {
+                return "linux";
+            } else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) {
+                return "darwin";
+            } else {
+                return "cli";
+            }
+        }
+
         internal static string GetVersionString() {
             string configuration = Runtime.ClrModule.IsDebug ? " DEBUG" : string.Empty;
             string bitness = (IntPtr.Size * 8).ToString();