From a37f0489bf1ad251a6a077f279bfc49b38f89b0c Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Mon, 22 Apr 2013 13:02:14 +0400
Subject: [PATCH 1/2] Fixed type inference for parenthesized yield expressions
 (PY-9590)

---
 .../python/psi/impl/PyTargetExpressionImpl.java          | 5 ++++-
 python/testSrc/com/jetbrains/python/PyTypeTest.java      | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
index 117983e93c69..4559a43204e1 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
@@ -135,7 +135,10 @@ public class PyTargetExpressionImpl extends PyPresentableElementImpl<PyTargetExp
       final PsiElement parent = getParent();
       if (parent instanceof PyAssignmentStatement) {
         final PyAssignmentStatement assignmentStatement = (PyAssignmentStatement)parent;
-        final PyExpression assignedValue = assignmentStatement.getAssignedValue();
+        PyExpression assignedValue = assignmentStatement.getAssignedValue();
+        if (assignedValue instanceof PyParenthesizedExpression) {
+          assignedValue = ((PyParenthesizedExpression)assignedValue).getContainedExpression();
+        }
         if (assignedValue != null) {
           if (assignedValue instanceof PyReferenceExpressionImpl) {
             final PyReferenceExpressionImpl refex = (PyReferenceExpressionImpl)assignedValue;
diff --git a/python/testSrc/com/jetbrains/python/PyTypeTest.java b/python/testSrc/com/jetbrains/python/PyTypeTest.java
index d023461516fe..5fb54a40e11f 100644
--- a/python/testSrc/com/jetbrains/python/PyTypeTest.java
+++ b/python/testSrc/com/jetbrains/python/PyTypeTest.java
@@ -340,6 +340,15 @@ public class PyTypeTest extends PyTestCase {
     assertNull(actual);
   }
 
+  // PY-9590
+  public void testYieldParensType() {
+    PyExpression expr = parseExpr("def f():\n" +
+                                  "    expr = (yield 2)\n");
+    TypeEvalContext context = TypeEvalContext.slow().withTracing();
+    PyType actual = context.getType(expr);
+    assertNull(actual);
+  }
+
   // PY-6702
   public void testYieldFromType() {
     PythonLanguageLevelPusher.setForcedLanguageLevel(myFixture.getProject(), LanguageLevel.PYTHON33);

From 904196eddca399da1f9a45c7a06ca9ec7ceaaa59 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Mon, 22 Apr 2013 13:36:26 +0400
Subject: [PATCH 2/2] Inlined PyClassImpl.calculateAncestorTypes()

---
 python/src/com/jetbrains/python/psi/impl/PyClassImpl.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java b/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
index 62d397d718e0..ad48778420eb 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
@@ -1091,11 +1091,6 @@ public class PyClassImpl extends PyPresentableElementImpl<PyClassStub> implement
   @NotNull
   @Override
   public List<PyClassLikeType> getAncestorTypes(@NotNull TypeEvalContext context) {
-    return calculateAncestorTypes(context);
-  }
-
-  @NotNull
-  private List<PyClassLikeType> calculateAncestorTypes(@NotNull TypeEvalContext context) {
     myCachedAncestorsProvider.setTypeEvalContext(context);
     try {
       // TODO: Return different cached copies depending on the type eval context parameters