From 5192ed484bdbe507a8dd03dc31f93e4efec95b19 Mon Sep 17 00:00:00 2001
From: Zsolt Dollenstein <zsol.zsol@gmail.com>
Date: Tue, 17 Apr 2018 09:04:35 +0100
Subject: [PATCH] Parse complex expressions in parameters after * and **

---
 black.py                             |   2 +-
 blib2to3/Grammar.txt                 |   4 ++--
 blib2to3/Grammar3.6.5.final.0.pickle | Bin 15152 -> 15143 bytes
 tests/expression.diff                |  11 ++++++++---
 tests/expression.py                  |   6 ++++++
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/black.py b/black.py
index c3610c7..7c487f6 100644
--- a/black.py
+++ b/black.py
@@ -1364,7 +1364,7 @@ def whitespace(leaf: Leaf) -> str:  # noqa C901
             if not prevp or prevp.type == token.LPAR:
                 return NO
 
-        elif prev.type == token.EQUAL or prev.type == token.DOUBLESTAR:
+        elif prev.type in {token.EQUAL, token.STAR, token.DOUBLESTAR}:
             return NO
 
     elif p.type == syms.decorator:
diff --git a/blib2to3/Grammar.txt b/blib2to3/Grammar.txt
index 4905c91..c9cb3a7 100644
--- a/blib2to3/Grammar.txt
+++ b/blib2to3/Grammar.txt
@@ -138,8 +138,8 @@ arglist: argument (',' argument)* [',']
 # that precede iterable unpackings are blocked; etc.
 argument: ( test [comp_for] |
             test '=' test |
-	    '**' expr |
-	    star_expr )
+	    '**' test |
+            '*' test )
 
 comp_iter: comp_for | comp_if
 comp_for: [ASYNC] 'for' exprlist 'in' or_test [comp_iter]
diff --git a/blib2to3/Grammar3.6.5.final.0.pickle b/blib2to3/Grammar3.6.5.final.0.pickle
index 3a8d93d064336eeef658656eb2916ca35a9089ca..e9d5fabf717b9731ad6cd3524b4d09419a08cd78 100644
GIT binary patch
delta 3404
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

delta 3296
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

diff --git a/tests/expression.diff b/tests/expression.diff
index bc34c0e..dd9459c 100644
--- a/tests/expression.diff
+++ b/tests/expression.diff
@@ -117,7 +117,7 @@
  ]
  slice[0]
  slice[0:1]
-@@ -121,85 +135,119 @@
+@@ -121,88 +135,122 @@
  numpy[-(c + 1):, d]
  numpy[:, l[-2]]
  numpy[:, ::-1]
@@ -184,6 +184,12 @@
  
  async def f():
      await some.complicated[0].call(with_args=(True or (1 is not 1)))
+-print(* [] or [1])
++
++
++print(*[] or [1])
+ print(**{1: 3} if False else {x: x for x in range(3)})
+-print(* lambda x: x)
 -for x, in (1,), (2,), (3,): ...
 -for y in (): ...
 -for z in (i for i in (1, 2, 3)): ...
@@ -226,8 +232,7 @@
 -    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 -):
 -    return True
-+
-+
++print(*lambda x: x)
 +for (x,) in (1,), (2,), (3,):
 +    ...
 +for y in ():
diff --git a/tests/expression.py b/tests/expression.py
index 9c07177..2ecf522 100644
--- a/tests/expression.py
+++ b/tests/expression.py
@@ -158,6 +158,9 @@ def gen():
 
 async def f():
     await some.complicated[0].call(with_args=(True or (1 is not 1)))
+print(* [] or [1])
+print(**{1: 3} if False else {x: x for x in range(3)})
+print(* lambda x: x)
 for x, in (1,), (2,), (3,): ...
 for y in (): ...
 for z in (i for i in (1, 2, 3)): ...
@@ -402,6 +405,9 @@ async def f():
     await some.complicated[0].call(with_args=(True or (1 is not 1)))
 
 
+print(*[] or [1])
+print(**{1: 3} if False else {x: x for x in range(3)})
+print(*lambda x: x)
 for (x,) in (1,), (2,), (3,):
     ...
 for y in ():
-- 
2.39.5