@@ -117,7 +117,7 @@ public static IntPtr mp_subscript(IntPtr ob, IntPtr idx)
 
             try
             {
-                value = items.GetValue((int[])args);
+                value = items.GetValue(args);
             }
             catch (IndexOutOfRangeException)
             {
@@ -210,7 +210,7 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)
 
             try
             {
-                items.SetValue(value, (int[])args);
+                items.SetValue(value, args);
             }
             catch (IndexOutOfRangeException)
             {
 
@@ -1,8 +1,8 @@
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 [assembly: AssemblyProduct("Python for .NET")]
 [assembly: AssemblyVersion("4.0.0.1")]
 
@@ -158,12 +158,10 @@ internal static void UpdatePath()
         public static string FindAssembly(string name)
         {
             char sep = Path.DirectorySeparatorChar;
-            string path;
-            string temp;
 
-            for (var i = 0; i < pypath.Count; i++)
+            foreach (string head in pypath)
             {
-                string head = pypath[i];
+                string path;
                 if (head == null || head.Length == 0)
                 {
                     path = name;
@@ -173,11 +171,12 @@ public static string FindAssembly(string name)
                     path = head + sep + name;
                 }
 
-                temp = path + ".dll";
+                string temp = path + ".dll";
                 if (File.Exists(temp))
                 {
                     return temp;
                 }
+
                 temp = path + ".exe";
                 if (File.Exists(temp))
                 {
@@ -233,10 +232,8 @@ public static Assembly LoadAssemblyPath(string name)
         /// <summary>
         /// Loads an assembly using full path.
         /// </summary>
-        /// <param name="name">
-        /// </param>
-        /// <returns>
-        /// </returns>
+        /// <param name="name"></param>
+        /// <returns></returns>
         public static Assembly LoadAssemblyFullPath(string name)
         {
             Assembly assembly = null;
@@ -252,7 +249,7 @@ public static Assembly LoadAssemblyFullPath(string name)
                     {
                         assembly = Assembly.LoadFrom(name);
                     }
-                    catch
+                    catch (Exception)
                     {
                     }
                 }
 
@@ -1,7 +1,5 @@
 using System;
 using System.Collections;
-using System.Reflection;
-using System.Security;
 using System.Runtime.InteropServices;
 
 namespace Python.Runtime
@@ -27,7 +25,7 @@ internal ClassBase(Type tp)
 
         internal virtual bool CanSubclass()
         {
-            return (!this.type.IsEnum);
+            return !type.IsEnum;
         }
 
         /// <summary>
@@ -49,12 +47,12 @@ public virtual IntPtr type_subscript(IntPtr idx)
                 return Exceptions.RaiseTypeError("type(s) expected");
             }
 
-            Type target = GenericUtil.GenericForType(this.type, types.Length);
+            Type target = GenericUtil.GenericForType(type, types.Length);
 
             if (target != null)
             {
                 Type t = target.MakeGenericType(types);
-                ManagedType c = (ManagedType)ClassManager.GetClass(t);
+                ManagedType c = ClassManager.GetClass(t);
                 Runtime.XIncref(c.pyHandle);
                 return c.pyHandle;
             }
@@ -115,10 +113,15 @@ public static IntPtr tp_richcompare(IntPtr ob, IntPtr other, int op)
                     co1 = GetManagedObject(ob) as CLRObject;
                     co2 = GetManagedObject(other) as CLRObject;
                     if (co1 == null || co2 == null)
+                    {
                         return Exceptions.RaiseTypeError("Cannot get managed object");
+                    }
                     var co1Comp = co1.inst as IComparable;
                     if (co1Comp == null)
-                        return Exceptions.RaiseTypeError("Cannot convert object of type " + co1.GetType() + " to IComparable");
+                    {
+                        Type co1Type = co1.GetType();
+                        return Exceptions.RaiseTypeError($"Cannot convert object of type {co1Type} to IComparable");
+                    }
                     try
                     {
                         int cmp = co1Comp.CompareTo(co2.inst);
Original file line number	Diff line number	Diff line change
@@ -117,7 +117,7 @@ public static IntPtr mp_subscript(IntPtr ob, IntPtr idx)
117	117
118	118	try
119	119	{
120		- value = items.GetValue((int[])args);
	120	+ value = items.GetValue(args);
121	121	}
122	122	catch (IndexOutOfRangeException)
123	123	{
@@ -210,7 +210,7 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)
210	210
211	211	try
212	212	{
213		- items.SetValue(value, (int[])args);
	213	+ items.SetValue(value, args);
214	214	}
215	215	catch (IndexOutOfRangeException)
216	216	{
Original file line number	Diff line number	Diff line change
@@ -158,12 +158,10 @@ internal static void UpdatePath()
158	158	public static string FindAssembly(string name)
159	159	{
160	160	char sep = Path.DirectorySeparatorChar;
161		- string path;
162		- string temp;
163	161
164		- for (var i = 0; i < pypath.Count; i++)
	162	+ foreach (string head in pypath)
165	163	{
166		- string head = pypath[i];
	164	+ string path;
167	165	if (head == null \|\| head.Length == 0)
168	166	{
169	167	path = name;
@@ -173,11 +171,12 @@ public static string FindAssembly(string name)
173	171	path = head + sep + name;
174	172	}
175	173
176		- temp = path + ".dll";
	174	+ string temp = path + ".dll";
177	175	if (File.Exists(temp))
178	176	{
179	177	return temp;
180	178	}
	179	+
181	180	temp = path + ".exe";
182	181	if (File.Exists(temp))
183	182	{
@@ -233,10 +232,8 @@ public static Assembly LoadAssemblyPath(string name)
233	232	/// <summary>
234	233	/// Loads an assembly using full path.
235	234	/// </summary>
236		- /// <param name="name">
237		- /// </param>
238		- /// <returns>
239		- /// </returns>
	235	+ /// <param name="name"></param>
	236	+ /// <returns></returns>
240	237	public static Assembly LoadAssemblyFullPath(string name)
241	238	{
242	239	Assembly assembly = null;
@@ -252,7 +249,7 @@ public static Assembly LoadAssemblyFullPath(string name)
252	249	{
253	250	assembly = Assembly.LoadFrom(name);
254	251	}
255		- catch
	252	+ catch (Exception)
256	253	{
257	254	}
258	255	}