Blame 0003-Fix-1095.-Look-for-the-keyword-type-in-the-right-pla.patch
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
c440ca5 |
From fddb3482039c6fb23fd223ffa1976483209a72db Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
From: David Shea <dshea@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
Date: Mon, 4 Jan 2016 13:19:43 -0500
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
c440ca5 |
Subject: [PATCH 3/4] Fix #1095. Look for the keyword type in the right place.
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
From https://github.com/JukkaL/mypy/issues/1095#issuecomment-166725598
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
---
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
mypy/checkexpr.py | 3 ++-
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
index 23d3fa0..7c45cc0 100644
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
--- a/mypy/checkexpr.py
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
+++ b/mypy/checkexpr.py
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
@@ -542,7 +542,8 @@ class ExpressionChecker:
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
nodes.ARG_NAMED] and is_duplicate_mapping(
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
formal_to_actual[i], actual_kinds):
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
if (self.chk.typing_mode_full() or
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
- isinstance(actual_type, TupleType)):
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
+ (i < len(actual_types) and
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
+ isinstance(actual_types[i], TupleType))):
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
self.msg.duplicate_argument_value(callee, i, context)
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
elif (kind == nodes.ARG_NAMED and formal_to_actual[i] and
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
actual_kinds[formal_to_actual[i][0]] != nodes.ARG_NAMED):
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
--
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
2.6.4
|
|
![](https://seccdn.libravatar.org/avatar/b02ef8c8d16c8ff8175040d35a7f6add060e102cc90c0cecbcb110d12eccac37?s=16&d=retro) |
5a12ad0 |
|