From b11d6bedc9b58746c98e493dfc97fe0a1bf7eb60 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Thu, 1 Aug 2013 16:28:38 +0400
Subject: [PATCH] Fixed signature of PyCallableType.getParameters() for
 inheritors

---
 .../com/jetbrains/python/psi/impl/PyJavaClassType.java     | 7 +++++--
 .../com/jetbrains/python/psi/impl/PyJavaMethodType.java    | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java
index 83f9e1476d87..adbe3806074f 100644
--- a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java
+++ b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaClassType.java
@@ -1,5 +1,6 @@
 package com.jetbrains.python.psi.impl;
 
+import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiMethod;
@@ -11,7 +12,9 @@ import com.jetbrains.python.psi.PyQualifiedExpression;
 import com.jetbrains.python.psi.resolve.CompletionVariantsProcessor;
 import com.jetbrains.python.psi.resolve.PyResolveContext;
 import com.jetbrains.python.psi.resolve.RatedResolveResult;
-import com.jetbrains.python.psi.types.*;
+import com.jetbrains.python.psi.types.PyClassLikeType;
+import com.jetbrains.python.psi.types.PyType;
+import com.jetbrains.python.psi.types.TypeEvalContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -98,7 +101,7 @@ public class PyJavaClassType implements PyClassLikeType {
 
   @Nullable
   @Override
-  public List<PyType> getParameters(@NotNull TypeEvalContext context) {
+  public List<Pair<String, PyType>> getParameters(@NotNull TypeEvalContext context) {
     return null;
   }
 
diff --git a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaMethodType.java b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaMethodType.java
index 9916559f07d1..3ef7355229b9 100644
--- a/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaMethodType.java
+++ b/python/pluginSrc/com/jetbrains/python/psi/impl/PyJavaMethodType.java
@@ -1,5 +1,6 @@
 package com.jetbrains.python.psi.impl;
 
+import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
 import com.intellij.util.ArrayUtil;
@@ -41,7 +42,7 @@ public class PyJavaMethodType implements PyCallableType {
 
   @Nullable
   @Override
-  public List<PyType> getParameters(@NotNull TypeEvalContext context) {
+  public List<Pair<String, PyType>> getParameters(@NotNull TypeEvalContext context) {
     return null;
   }