Remove FEATURE_BASIC_CONSOLE and FEATURE_FULL_CONSOLE (#1727)

BCSharp · web-flow · commit 8c0333b3d327 · 2023-08-18T19:54:24.000-07:00
diff --git a/Build/net462.props b/Build/net462.props
@@ -10,15 +10,13 @@
     <Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_SAVE</Features>
-    <Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
     <Features>$(Features);FEATURE_CODEDOM</Features>
     <Features>$(Features);FEATURE_COM</Features>
     <Features>$(Features);FEATURE_CONFIGURATION</Features>
     <Features>$(Features);FEATURE_CTYPES</Features>
     <Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
     <Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
     <Features>$(Features);FEATURE_FILESYSTEM</Features>
-    <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_FULL_CRYPTO</Features>
     <Features>$(Features);FEATURE_FULL_NET</Features>
     <Features>$(Features);FEATURE_LAMBDAEXPRESSION_COMPILETOMETHOD</Features>
diff --git a/Build/net6.0.props b/Build/net6.0.props
@@ -9,15 +9,13 @@
     <Features>$(Features);FEATURE_ASSEMBLY_GETFORWARDEDTYPES</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
-    <Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
     <Features>$(Features);FEATURE_CODEDOM</Features>
     <Features>$(Features);FEATURE_COM</Features>
     <Features>$(Features);FEATURE_CONFIGURATION</Features>
     <Features>$(Features);FEATURE_CTYPES</Features>
     <Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
     <Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
     <Features>$(Features);FEATURE_FILESYSTEM</Features>
-    <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_FULL_CRYPTO</Features>
     <Features>$(Features);FEATURE_FULL_NET</Features>
     <Features>$(Features);FEATURE_LCG</Features>
diff --git a/Build/netcoreapp2.1.props b/Build/netcoreapp2.1.props
@@ -9,14 +9,12 @@
     <Features>$(Features);FEATURE_ASSEMBLY_GETFORWARDEDTYPES</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
-    <Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
     <Features>$(Features);FEATURE_CODEDOM</Features>
     <Features>$(Features);FEATURE_CONFIGURATION</Features>
     <Features>$(Features);FEATURE_CTYPES</Features>
     <Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
     <Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
     <Features>$(Features);FEATURE_FILESYSTEM</Features>
-    <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_FULL_CRYPTO</Features>
     <Features>$(Features);FEATURE_FULL_NET</Features>
     <Features>$(Features);FEATURE_LCG</Features>
diff --git a/Build/netcoreapp3.1.props b/Build/netcoreapp3.1.props
@@ -9,15 +9,13 @@
     <Features>$(Features);FEATURE_ASSEMBLY_GETFORWARDEDTYPES</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
-    <Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
     <Features>$(Features);FEATURE_CODEDOM</Features>
     <Features>$(Features);FEATURE_COM</Features>
     <Features>$(Features);FEATURE_CONFIGURATION</Features>
     <Features>$(Features);FEATURE_CTYPES</Features>
     <Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
     <Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
     <Features>$(Features);FEATURE_FILESYSTEM</Features>
-    <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_FULL_CRYPTO</Features>
     <Features>$(Features);FEATURE_FULL_NET</Features>
     <Features>$(Features);FEATURE_LCG</Features>
diff --git a/Build/netstandard2.0.props b/Build/netstandard2.0.props
@@ -8,14 +8,12 @@
     <Features>$(Features);FEATURE_APARTMENTSTATE</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
-    <Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
     <Features>$(Features);FEATURE_CODEDOM</Features>
     <Features>$(Features);FEATURE_CONFIGURATION</Features>
     <Features>$(Features);FEATURE_CTYPES</Features>
     <Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
     <Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
     <Features>$(Features);FEATURE_FILESYSTEM</Features>
-    <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_FULL_CRYPTO</Features>
     <Features>$(Features);FEATURE_FULL_NET</Features>
     <Features>$(Features);FEATURE_LCG</Features>
diff --git a/Documentation/feature-symbols.md b/Documentation/feature-symbols.md
@@ -20,9 +20,6 @@ System.Reflection.Emit.AssemblyBuilder.DefineDynamicAssembly
 ### FEATURE_ASSEMBLYBUILDER_SAVE
 System.Reflection.Emit.AssemblyBuilder.Save
 
-### FEATURE_BASIC_CONSOLE
-Basic Console features like Console.WriteLine, Console.ReadLine.
-
 ### FEATURE_CODEDOM
 System.CodeDom
 
@@ -42,9 +39,6 @@ System.Threading.ThreadAbortException.ExceptionState
 ### FEATURE_FILESYSTEM
 Full file system (Directory, File, Path, FileStream, etc.)
 
-### FEATURE_FULL_CONSOLE
-Full Console APIs including stdin, stdout, stderr streams, colors, etc.
-
 ### FEATURE_FULL_CRYPTO
 
 ### FEATURE_FULL_NET
diff --git a/Src/IronPython.Modules/bz2/dotnetzip/BZip2/BZip2OutputStream.cs b/Src/IronPython.Modules/bz2/dotnetzip/BZip2/BZip2OutputStream.cs
@@ -512,14 +512,10 @@ private void TraceOutput(TraceBits bits, string format, params object[] varParam
                 //lock(outputLock)
                 {
                     int tid = System.Threading.Thread.CurrentThread.GetHashCode();
-#if FEATURE_FULL_CONSOLE
                     Console.ForegroundColor = (ConsoleColor) (tid % 8 + 10);
-#endif
                     Console.Write("{0:000} PBOS ", tid);
                     Console.WriteLine(format, varParams);
-#if FEATURE_FULL_CONSOLE
                     Console.ResetColor();
-#endif
                 }
             }
         }
diff --git a/Src/IronPython.Modules/bz2/dotnetzip/BZip2/ParallelBZip2OutputStream.cs b/Src/IronPython.Modules/bz2/dotnetzip/BZip2/ParallelBZip2OutputStream.cs
@@ -980,14 +980,10 @@ private void TraceOutput(TraceBits bits, string format, params object[] varParam
                 lock(outputLock)
                 {
                     int tid = Thread.CurrentThread.GetHashCode();
-#if FEATURE_FULL_CONSOLE
                     Console.ForegroundColor = (ConsoleColor) (tid % 8 + 10);
-#endif
                     Console.Write("{0:000} PBOS ", tid);
                     Console.WriteLine(format, varParams);
-#if FEATURE_FULL_CONSOLE
                     Console.ResetColor();
-#endif
                 }
             }
         }
diff --git a/Src/IronPython/Hosting/PythonCommandLine.cs b/Src/IronPython/Hosting/PythonCommandLine.cs
@@ -2,8 +2,6 @@
 // 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.
 
-#if FEATURE_FULL_CONSOLE
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -644,5 +642,3 @@ protected override void UnhandledException(Exception e) {
 
     }
 }
-
-#endif
diff --git a/Src/IronPython/Hosting/PythonConsoleOptions.cs b/Src/IronPython/Hosting/PythonConsoleOptions.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // 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.
-#if FEATURE_FULL_CONSOLE
+
 using System;
 using Microsoft.Scripting.Hosting.Shell; 
 
@@ -27,4 +27,3 @@ public sealed class PythonConsoleOptions : ConsoleOptions {
         public bool PrintSysVersion { get; set; }
     }
 }
-#endif
diff --git a/Src/IronPython/Hosting/PythonOptionsParser.cs b/Src/IronPython/Hosting/PythonOptionsParser.cs
@@ -2,8 +2,6 @@
 // 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.
 
-#if FEATURE_FULL_CONSOLE
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -404,5 +402,3 @@ public override void GetHelp(out string commandLine, out string[,] options, out
         }
     }
 }
-
-#endif
diff --git a/Src/IronPython/Runtime/Operations/PythonOps.cs b/Src/IronPython/Runtime/Operations/PythonOps.cs
@@ -2008,13 +2008,10 @@ internal static void PrintException(CodeContext/*!*/ context, Exception/*!*/ exc
             object exceptHook = pc.GetSystemStateValue("excepthook");
             if (exceptHook is BuiltinFunction bf && bf.DeclaringType == typeof(SysModule) && bf.Name == "excepthook") {
                 // builtin except hook
-#if FEATURE_FULL_CONSOLE
                 if (console is IConsole con) {
                     // display it to the console which may do nice coloring
                     con.WriteLine(pc.FormatException(exception), Style.Error);
-                } else
-#endif
-                {
+                } else {
                     PrintWithDest(context, pc.SystemStandardError, pc.FormatException(exception));
                 }
             } else {
diff --git a/Src/IronPython/Runtime/PythonContext.cs b/Src/IronPython/Runtime/PythonContext.cs
@@ -1301,11 +1301,9 @@ public override void Shutdown() {
                     PythonCalls.Call(SharedContext, callable);
                 }
             } finally {
-#if FEATURE_BASIC_CONSOLE
                 if (PythonOptions.PerfStats) {
                     PerfTrack.DumpStats();
                 }
-#endif
             }
 
             Flush(SharedContext, SystemStandardOut);
diff --git a/Src/IronPython/Runtime/Types/DocBuilder.cs b/Src/IronPython/Runtime/Types/DocBuilder.cs
@@ -330,17 +330,13 @@ internal static string CreateAutoDoc(MethodBase info, string name, int endParamS
         }
 
         internal static string CreateAutoDoc(MethodBase info, string name, int endParamSkip, bool includeSelf) {
-#if FEATURE_FULL_CONSOLE
             int lineWidth;
             try {
                 lineWidth = Console.WindowWidth - 30;
             } catch {
                 // console output has been redirected.
                 lineWidth = 80;
             }
-#else
-            int lineWidth = 80;
-#endif
             var docInfo = GetOverloadDoc(info, name, endParamSkip, includeSelf);
             StringBuilder ret = new StringBuilder();
 

Original file line number	Diff line number	Diff line change
`@@ -512,14 +512,10 @@ private void TraceOutput(TraceBits bits, string format, params object[] varParam`
`512`	`512`	`//lock(outputLock)`
`513`	`513`	`{`
`514`	`514`	`int tid = System.Threading.Thread.CurrentThread.GetHashCode();`
`515`		`-#if FEATURE_FULL_CONSOLE`
`516`	`515`	`Console.ForegroundColor = (ConsoleColor) (tid % 8 + 10);`
`517`		`-#endif`
`518`	`516`	`Console.Write("{0:000} PBOS ", tid);`
`519`	`517`	`Console.WriteLine(format, varParams);`
`520`		`-#if FEATURE_FULL_CONSOLE`
`521`	`518`	`Console.ResetColor();`
`522`		`-#endif`
`523`	`519`	`}`
`524`	`520`	`}`
`525`	`521`	`}`
Original file line number	Diff line number	Diff line change
`@@ -980,14 +980,10 @@ private void TraceOutput(TraceBits bits, string format, params object[] varParam`
`980`	`980`	`lock(outputLock)`
`981`	`981`	`{`
`982`	`982`	`int tid = Thread.CurrentThread.GetHashCode();`
`983`		`-#if FEATURE_FULL_CONSOLE`
`984`	`983`	`Console.ForegroundColor = (ConsoleColor) (tid % 8 + 10);`
`985`		`-#endif`
`986`	`984`	`Console.Write("{0:000} PBOS ", tid);`
`987`	`985`	`Console.WriteLine(format, varParams);`
`988`		`-#if FEATURE_FULL_CONSOLE`
`989`	`986`	`Console.ResetColor();`
`990`		`-#endif`
`991`	`987`	`}`
`992`	`988`	`}`
`993`	`989`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the Apache 2.0 License.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`		`-#if FEATURE_FULL_CONSOLE`
`6`		`-`
`7`	`5`	`using System;`
`8`	`6`	`using System.Collections.Generic;`
`9`	`7`	`using System.Diagnostics;`
`@@ -644,5 +642,3 @@ protected override void UnhandledException(Exception e) {`
`644`	`642`
`645`	`643`	`}`
`646`	`644`	`}`
`647`		`-`
`648`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the Apache 2.0 License.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`		`-#if FEATURE_FULL_CONSOLE`
	`4`	`+`
`5`	`5`	`using System;`
`6`	`6`	`using Microsoft.Scripting.Hosting.Shell;`
`7`	`7`
`@@ -27,4 +27,3 @@ public sealed class PythonConsoleOptions : ConsoleOptions {`
`27`	`27`	`public bool PrintSysVersion { get; set; }`
`28`	`28`	`}`
`29`	`29`	`}`
`30`		`-#endif`