Merge pull request #772 from zooba/issue-697

Fixes #697 Exception while editing IronPython code
microsoft · Aug 21, 2015 · baac242 · baac242
2 parents a985506 + 20c37fe
commit baac242
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Python/Product/IronPython/Interpreter/RemoteInterpreter.cs b/Python/Product/IronPython/Interpreter/RemoteInterpreter.cs
@@ -1055,9 +1055,10 @@ internal ObjectIdentityHandle TypeGroupMakeGenericType(ObjectIdentityHandle type
                 if (genType != null) {
                     Type[] genTypes = new Type[types.Length];
                     for (int i = 0; i < types.Length; i++) {
-                        genTypes[i] = (Type)Unwrap(types[i]);
+                        var o = Unwrap(types[i]);
+                        genTypes[i] = o as Type ?? (PythonType)o;
                     }
-                    return MakeHandle(genType.Type.MakeGenericType(genTypes));
+                    return MakeHandle(DynamicHelpers.GetPythonTypeFromType(genType.Type.MakeGenericType(genTypes)));
                 }
                 return new ObjectIdentityHandle();
             });