Addresses Peer-Review: Perfomance Improments

Author: AlexCatarino

src/runtime/keyvaluepairenumerableobject.cs

@@ -13,41 +13,32 @@ namespace Python.Runtime
     internal class KeyValuePairEnumerableObject : ClassObject
     {
         private static Dictionary<Tuple<Type, string>, MethodInfo> methodsByType = new Dictionary<Tuple<Type, string>, MethodInfo>();
-        private static Dictionary<string, string> methodMap = new Dictionary<string, string>
-        {
-            { "mp_length", "Count" },
-            { "sq_contains", "ContainsKey" }
-        };
-
-        public List<string> MappedMethods { get; } = new List<string>();
+        private static List<string> requiredMethods = new List<string> { "Count", "ContainsKey" };
 
-        internal KeyValuePairEnumerableObject(Type tp) : base(tp)
+        internal static bool VerifyMethodRequirements(Type type)
         {
-            if (!tp.IsKeyValuePairEnumerable())
-            {
-                throw new ArgumentException("object is not a KeyValuePair Enumerable");
-            }
-
-            foreach (var name in methodMap)
+            foreach (var requiredMethod in requiredMethods)
             {
-                var key = Tuple.Create(type, name.Value);
-                MethodInfo method;
-                if (!methodsByType.TryGetValue(key, out method))
+                var method = type.GetMethod(requiredMethod);
+                if (method == null)
                 {
-                    method = tp.GetMethod(name.Value);
+                    method = type.GetMethod($"get_{requiredMethod}");
                     if (method == null)
                     {
-                        method = tp.GetMethod($"get_{name.Value}");
+                        return false;
                     }
-                    if (method == null)
-                    {
-                        continue;
-                    }
-                    methodsByType.Add(key, method);
                 }
 
-                MappedMethods.Add(name.Key);
+                var key = Tuple.Create(type, requiredMethod);
+                methodsByType.Add(key, method);
             }
+
+            return true;
+        }
+
+        internal KeyValuePairEnumerableObject(Type tp) : base(tp)
+        {
+
         }
 
         internal override bool CanSubclass() => false;
@@ -95,7 +86,6 @@ public static bool IsKeyValuePairEnumerable(this Type type)
         {
             var iEnumerableType = typeof(IEnumerable<>);
             var keyValuePairType = typeof(KeyValuePair<,>);
-            var requiredMethods = new[] { "ContainsKey", "Count" };
 
             var interfaces = type.GetInterfaces();
             foreach (var i in interfaces)
@@ -111,20 +101,7 @@ public static bool IsKeyValuePairEnumerable(this Type type)
                         a.GetGenericTypeDefinition() == keyValuePairType &&
                         a.GetGenericArguments().Length == 2)
                     {
-                        foreach (var requiredMethod in requiredMethods)
-                        {
-                            var method = type.GetMethod(requiredMethod);
-                            if (method == null)
-                            {
-                                method = type.GetMethod($"get_{requiredMethod}");
-                                if (method == null)
-                                {
-                                    return false;
-                                }
-                            }
-                        }
-
-                        return true;
+                        return KeyValuePairEnumerableObject.VerifyMethodRequirements(type);
                     }
                 }
             }