CA1852 and CA1311

slozier · slozier · commit b73e48c702d2 · 2022-05-29T11:38:42.000-04:00
diff --git a/.editorconfig b/.editorconfig
@@ -80,6 +80,7 @@ dotnet_diagnostic.CA1838.severity = suggestion  # CA1838: Avoid 'StringBuilder'
 dotnet_diagnostic.CA1845.severity = none        # CA1845: Use span-based 'string.Concat'
 dotnet_diagnostic.CA1846.severity = none        # CA1846: Prefer 'AsSpan' over 'Substring'
 dotnet_diagnostic.CA1847.severity = none        # CA1847: Use char literal for a single character lookup
+dotnet_diagnostic.CA1852.severity = suggestion  # CA1852: Seal internal types
 dotnet_diagnostic.CA2101.severity = suggestion  # CA2101: Specify marshaling for P/Invoke string arguments
 dotnet_diagnostic.CA2201.severity = none        # CA2201: Do not raise reserved exception types
 dotnet_diagnostic.CA2208.severity = suggestion  # CA2208: Instantiate argument exceptions correctly
diff --git a/Src/DLR b/Src/DLR
@@ -1 +1 @@
-Subproject commit 69507f00e133530236c38772fc395cbbf7fa080f
+Subproject commit 9514edd235210c2ebb77f09fcc4379059bd7c719
diff --git a/Src/IronPython.Modules/_datetime.cs b/Src/IronPython.Modules/_datetime.cs
@@ -1472,7 +1472,7 @@ private int CompareTo(object other) {
                 string ltzname = tzname() as string;
                 if (ltzname != null) {
                     // TODO: calling __repr__?
-                    sb.AppendFormat(", tzinfo={0}", ltzname.ToLower());
+                    sb.AppendFormat(", tzinfo={0}", ltzname.ToLowerInvariant());
                 }
 
                 sb.AppendFormat(")");
diff --git a/Src/IronPython.Modules/_socket.cs b/Src/IronPython.Modules/_socket.cs
@@ -1232,7 +1232,7 @@ public static object getnameinfo(CodeContext/*!*/ context, [NotNone] PythonTuple
             + "Raises socket.error if no protocol number can be found."
             )]
         public static object getprotobyname(CodeContext/*!*/ context, [NotNone] string protocolName) {
-            switch (protocolName.ToLower()) {
+            switch (protocolName.ToLowerInvariant()) {
                 case "ah": return IPPROTO_AH;
                 case "esp": return IPPROTO_ESP;
                 case "dstopts": return IPPROTO_DSTOPTS;
@@ -1266,7 +1266,7 @@ public static int getservbyname(CodeContext/*!*/ context, [NotNone] string servi
         [Documentation("")]
         public static int getservbyname(CodeContext/*!*/ context, [NotNone] string serviceName, [NotNone] string protocolName) {
             if (protocolName != null) {
-                protocolName = protocolName.ToLower();
+                protocolName = protocolName.ToLowerInvariant();
                 if (protocolName != "udp" && protocolName != "tcp")
                     throw PythonExceptions.CreateThrowable(error, "service/proto not found");
             }
@@ -1277,7 +1277,7 @@ public static int getservbyname(CodeContext/*!*/ context, [NotNone] string servi
             } catch { }
 
 
-            switch (serviceName.ToLower()) {
+            switch (serviceName.ToLowerInvariant()) {
                 case "echo": return 7;
                 case "daytime": return 13;
                 case "ftp-data": return 20;
@@ -1327,7 +1327,7 @@ public static string getservbyport(CodeContext/*!*/ context, int port, [NotNone]
                 throw PythonOps.OverflowError("getservbyport: port must be 0-65535.");
 
             if (protocolName != null) {
-                protocolName = protocolName.ToLower();
+                protocolName = protocolName.ToLowerInvariant();
                 if (protocolName != "udp" && protocolName != "tcp")
                     throw PythonExceptions.CreateThrowable(error, "port/proto not found");
             }
diff --git a/Src/IronPython.SQLite/c#sqlite/build_c.cs b/Src/IronPython.SQLite/c#sqlite/build_c.cs
@@ -1202,7 +1202,7 @@ static char sqlite3AffinityType( string zIn )
     {
       //u32 h = 0;
       //char aff = SQLITE_AFF_NUMERIC;
-      zIn = zIn.ToLower();
+      zIn = zIn.ToLowerInvariant();
       if ( zIn.Contains( "char" ) || zIn.Contains( "clob" ) || zIn.Contains( "text" ) )
         return SQLITE_AFF_TEXT;
       if ( zIn.Contains( "blob" ) )
diff --git a/Src/IronPython.SQLite/c#sqlite/date_c.cs b/Src/IronPython.SQLite/c#sqlite/date_c.cs
@@ -682,7 +682,7 @@ static int parseModifier( sqlite3_context pCtx, string zMod, DateTime p )
       int rc = 1;
       int n;
       double r = 0;
-      StringBuilder z = new StringBuilder( zMod.ToLower() );
+      StringBuilder z = new StringBuilder( zMod.ToLowerInvariant() );
       zdtBuf.Length = 0;
       //z = zdtBuf;
       //for(n=0; n<ArraySize(zdtBuf)-1 && zMod[n]; n++){
diff --git a/Src/IronPython.SQLite/c#sqlite/func_c.cs b/Src/IronPython.SQLite/c#sqlite/func_c.cs
@@ -470,7 +470,7 @@ sqlite3_value[] argv
         //{
         //(char)sqlite3Toupper( z1[i] );
         //}
-        sqlite3_result_text( context, z2.Length == 0 ? "" : z2.Substring( 0, n ).ToUpper(), -1, null ); //sqlite3_free );
+        sqlite3_result_text( context, z2.Length == 0 ? "" : z2.Substring( 0, n ).ToUpperInvariant(), -1, null ); //sqlite3_free );
         // }
       }
     }
@@ -499,7 +499,7 @@ sqlite3_value[] argv
         //  {
         //    z1[i] = (char)sqlite3Tolower( z1[i] );
         //  }
-        sqlite3_result_text( context, z2.Length == 0 ? "" : z2.Substring( 0, n ).ToLower(), -1, null );//sqlite3_free );
+        sqlite3_result_text( context, z2.Length == 0 ? "" : z2.Substring( 0, n ).ToLowerInvariant(), -1, null );//sqlite3_free );
         //}
       }
     }
diff --git a/Src/IronPython.SQLite/c#sqlite/vdbemem_c.cs b/Src/IronPython.SQLite/c#sqlite/vdbemem_c.cs
@@ -305,7 +305,7 @@ static int sqlite3VdbeMemStringify( Mem pMem, int enc )
         else if ( Double.IsPositiveInfinity( pMem.r ) )
           pMem.z = "+Inf";
         else if ( pMem.r.ToString( CultureInfo.InvariantCulture ).Contains( "." ) )
-          pMem.z = pMem.r.ToString( CultureInfo.InvariantCulture ).ToLower();//sqlite3_snprintf(nByte, pMem.z, "%!.15g", pMem->r);
+          pMem.z = pMem.r.ToString( CultureInfo.InvariantCulture ).ToLowerInvariant();//sqlite3_snprintf(nByte, pMem.z, "%!.15g", pMem->r);
         else
           pMem.z = pMem.r.ToString( CultureInfo.InvariantCulture) + ".0";
       }
@@ -1604,4 +1604,4 @@ static int sqlite3ValueBytes( sqlite3_value pVal, int enc )
       return 0;
     }
   }
-}
+}
diff --git a/Src/IronPython/Runtime/LiteralParser.cs b/Src/IronPython/Runtime/LiteralParser.cs
@@ -987,7 +987,7 @@ private static Exception ExnMalformed() {
 
         public static Complex ParseComplex(string s) {
             // remove no-meaning spaces and convert to lowercase
-            string text = s.Trim().ToLower();
+            string text = s.Trim().ToLowerInvariant();
 
             // remove 1 layer of parens
             if (text.StartsWith("(", StringComparison.Ordinal) && text.EndsWith(")", StringComparison.Ordinal)) {
diff --git a/Src/IronPython/Runtime/Operations/FloatOps.cs b/Src/IronPython/Runtime/Operations/FloatOps.cs
@@ -315,7 +315,7 @@ public static object fromhex(CodeContext/*!*/ context, PythonType/*!*/ cls, stri
         }
 
         private static double? TryParseSpecialFloat(string self) {
-            switch (self.ToLower()) {
+            switch (self.ToLowerInvariant()) {
                 case "inf":
                 case "+inf":
                 case "infinity":
diff --git a/Src/IronPython/Runtime/PythonContext.cs b/Src/IronPython/Runtime/PythonContext.cs
@@ -1645,7 +1645,7 @@ public override void GetExceptionMessage(Exception exception, out string message
         public override Encoding DefaultEncoding { get; } = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true);
 
         public string GetDefaultEncodingName()
-            => DefaultEncoding.WebName.ToLower().Replace('-', '_');
+            => DefaultEncoding.WebName.ToLowerInvariant().Replace('-', '_');
 
         /// <summary>
         /// Dictionary from name to type of all known built-in module names.
diff --git a/Src/IronPythonCompiler/AssemblyResolver.cs b/Src/IronPythonCompiler/AssemblyResolver.cs
@@ -248,7 +248,7 @@ private static string CanonicalizePath(string path) {
             try {
                 FileInfo fi = new FileInfo(path);
                 if (fi.DirectoryName == null) {
-                    return path.Length > 1 && path[1] == ':' ? path.ToUpper() : path;
+                    return path.Length > 1 && path[1] == ':' ? path.ToUpperInvariant() : path;
                 }
                 string dir = CanonicalizePath(fi.DirectoryName);
                 string name = fi.Name;
diff --git a/Src/IronPythonCompiler/Config.cs b/Src/IronPythonCompiler/Config.cs
@@ -271,7 +271,7 @@ public void ParseArgs(IEnumerable<string> args, List<string> respFiles = null) {
                             ConsoleOps.Warning($"Already parsed response file '{arg.Substring(1)}'");
                         }
                     } else {
-                        if (arg.ToLower().EndsWith(".dll", StringComparison.Ordinal)) {
+                        if (arg.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) {
                             DLLs.Add(arg);
                         } else {
                             Files.Add(arg);
diff --git a/Src/IronPythonTest/BinderTest.cs b/Src/IronPythonTest/BinderTest.cs
@@ -188,7 +188,7 @@ public void M700(Delegate arg) {
         public int M704(Byte[] inp, ref Byte[] arg) { arg = inp; Flag.Value = 704; return 42; }
 
         // keywords 
-        public void M800(Int32 arg1, object arg2, ref string arg3) { arg3 = arg3.ToUpper(); }
+        public void M800(Int32 arg1, object arg2, ref string arg3) { arg3 = arg3.ToUpperInvariant(); }
 
         // more ref/out 
         public void M850(ref S1 arg) { arg = new S1(); }
diff --git a/Src/IronPythonTest/Cases/CaseExecuter.cs b/Src/IronPythonTest/Cases/CaseExecuter.cs
@@ -82,7 +82,7 @@ internal static string FindRoot() {
 
         private static void AddSearchPaths(ScriptEngine engine) {
             var paths = new List<string>(engine.GetSearchPaths());
-            if (!paths.Any(x => x.ToLower().Contains("stdlib"))) {
+            if (!paths.Any(x => x.ToLowerInvariant().Contains("stdlib"))) {
                 var root = FindRoot();
                 if (!string.IsNullOrEmpty(root)) {
                     paths.Insert(0, Path.Combine(root, "Src", "StdLib", "Lib"));

Original file line number	Diff line number	Diff line change
`@@ -1472,7 +1472,7 @@ private int CompareTo(object other) {`
`1472`	`1472`	`string ltzname = tzname() as string;`
`1473`	`1473`	`if (ltzname != null) {`
`1474`	`1474`	`// TODO: calling __repr__?`
`1475`		`- sb.AppendFormat(", tzinfo={0}", ltzname.ToLower());`
	`1475`	`+ sb.AppendFormat(", tzinfo={0}", ltzname.ToLowerInvariant());`
`1476`	`1476`	`}`
`1477`	`1477`
`1478`	`1478`	`sb.AppendFormat(")");`
Original file line number	Diff line number	Diff line change
`@@ -1202,7 +1202,7 @@ static char sqlite3AffinityType( string zIn )`
`1202`	`1202`	`{`
`1203`	`1203`	`//u32 h = 0;`
`1204`	`1204`	`//char aff = SQLITE_AFF_NUMERIC;`
`1205`		`- zIn = zIn.ToLower();`
	`1205`	`+ zIn = zIn.ToLowerInvariant();`
`1206`	`1206`	`if ( zIn.Contains( "char" ) \|\| zIn.Contains( "clob" ) \|\| zIn.Contains( "text" ) )`
`1207`	`1207`	`return SQLITE_AFF_TEXT;`
`1208`	`1208`	`if ( zIn.Contains( "blob" ) )`
Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ sqlite3_value[] argv`
`470`	`470`	`//{`
`471`	`471`	`//(char)sqlite3Toupper( z1[i] );`
`472`	`472`	`//}`
`473`		`- sqlite3_result_text( context, z2.Length == 0 ? "" : z2.Substring( 0, n ).ToUpper(), -1, null ); //sqlite3_free );`
	`473`	`+ sqlite3_result_text( context, z2.Length == 0 ? "" : z2.Substring( 0, n ).ToUpperInvariant(), -1, null ); //sqlite3_free );`
`474`	`474`	`// }`
`475`	`475`	`}`
`476`	`476`	`}`
`@@ -499,7 +499,7 @@ sqlite3_value[] argv`
`499`	`499`	`// {`
`500`	`500`	`// z1[i] = (char)sqlite3Tolower( z1[i] );`
`501`	`501`	`// }`
`502`		`- sqlite3_result_text( context, z2.Length == 0 ? "" : z2.Substring( 0, n ).ToLower(), -1, null );//sqlite3_free );`
	`502`	`+ sqlite3_result_text( context, z2.Length == 0 ? "" : z2.Substring( 0, n ).ToLowerInvariant(), -1, null );//sqlite3_free );`
`503`	`503`	`//}`
`504`	`504`	`}`
`505`	`505`	`}`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ static int sqlite3VdbeMemStringify( Mem pMem, int enc )`
`305`	`305`	`else if ( Double.IsPositiveInfinity( pMem.r ) )`
`306`	`306`	`pMem.z = "+Inf";`
`307`	`307`	`else if ( pMem.r.ToString( CultureInfo.InvariantCulture ).Contains( "." ) )`
`308`		`- pMem.z = pMem.r.ToString( CultureInfo.InvariantCulture ).ToLower();//sqlite3_snprintf(nByte, pMem.z, "%!.15g", pMem->r);`
	`308`	`+ pMem.z = pMem.r.ToString( CultureInfo.InvariantCulture ).ToLowerInvariant();//sqlite3_snprintf(nByte, pMem.z, "%!.15g", pMem->r);`
`309`	`309`	`else`
`310`	`310`	`pMem.z = pMem.r.ToString( CultureInfo.InvariantCulture) + ".0";`
`311`	`311`	`}`
`@@ -1604,4 +1604,4 @@ static int sqlite3ValueBytes( sqlite3_value pVal, int enc )`
`1604`	`1604`	`return 0;`
`1605`	`1605`	`}`
`1606`	`1606`	`}`
`1607`		`-}`
	`1607`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ public static object fromhex(CodeContext/!/ context, PythonType/!/ cls, stri`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`private static double? TryParseSpecialFloat(string self) {`
`318`		`- switch (self.ToLower()) {`
	`318`	`+ switch (self.ToLowerInvariant()) {`
`319`	`319`	`case "inf":`
`320`	`320`	`case "+inf":`
`321`	`321`	`case "infinity":`