Issue 1155: Handle LHS and RHS values differently

blib2to3/pgen2/driver.py

@@ -128,7 +128,7 @@ def parse_stream(self, stream: IO[Text], debug: bool = False) -> NL:
         return self.parse_stream_raw(stream, debug)
 
     def parse_file(
-        self, filename: Path, encoding: Optional[Text] = None, debug: bool = False,
+        self, filename: Path, encoding: Optional[Text] = None, debug: bool = False
     ) -> NL:
         """Parse a file and return the syntax tree."""
         with io.open(filename, "r", encoding=encoding) as stream:

tests/data/collections.py

@@ -50,6 +50,15 @@
 division_result_tuple = (6/2,)
 print("foo %r", (foo.bar,))
 
+subscript_one_item[1]
+subscript_multiple_items[1, 2, {3: 4}]
+subscript_one_item = subscript_one_item[1]
+subscript_multiple_items = subscript_multiple_items[1, 2, {3: 4}]
+subscript_one_item[1,]
+subscript_multiple_items[1, 2, {3: 4},]
+subscript_one_item = subscript_one_item[1,]
+subscript_multiple_items = subscript_multiple_items[1, 2, {3: 4},]
+
 if True:
     IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING = (
         Config.IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING
@@ -60,11 +69,11 @@
     ec2client.get_waiter('instance_stopped').wait(
         InstanceIds=[instance.id],
         WaiterConfig={
-            'Delay': 5,
+            'Delay': 5
         })
     ec2client.get_waiter("instance_stopped").wait(
         InstanceIds=[instance.id],
-        WaiterConfig={"Delay": 5,},
+        WaiterConfig={"Delay": 5},
     )
     ec2client.get_waiter("instance_stopped").wait(
         InstanceIds=[instance.id], WaiterConfig={"Delay": 5,},
@@ -143,6 +152,23 @@
 division_result_tuple = (6 / 2,)
 print("foo %r", (foo.bar,))
 
+subscript_one_item[1]
+subscript_multiple_items[1, 2, {3: 4}]
+subscript_one_item = subscript_one_item[1]
+subscript_multiple_items = subscript_multiple_items[1, 2, {3: 4}]
+subscript_one_item[1,]
+subscript_multiple_items[
+    1,
+    2,
+    {3: 4},
+]
+subscript_one_item = subscript_one_item[1,]
+subscript_multiple_items = subscript_multiple_items[
+    1,
+    2,
+    {3: 4},
+]
+
 if True:
     IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING = (
         Config.IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING
@@ -151,11 +177,15 @@
 
 if True:
     ec2client.get_waiter("instance_stopped").wait(
-        InstanceIds=[instance.id], WaiterConfig={"Delay": 5,}
+        InstanceIds=[instance.id], WaiterConfig={"Delay": 5}
     )
     ec2client.get_waiter("instance_stopped").wait(
-        InstanceIds=[instance.id], WaiterConfig={"Delay": 5,},
+        InstanceIds=[instance.id],
+        WaiterConfig={"Delay": 5},
     )
     ec2client.get_waiter("instance_stopped").wait(
-        InstanceIds=[instance.id], WaiterConfig={"Delay": 5,},
+        InstanceIds=[instance.id],
+        WaiterConfig={
+            "Delay": 5,
+        },
     )

tests/data/comments7.py

@@ -94,7 +94,12 @@ def func():
 
 def func():
     c = call(
-        0.0123, 0.0456, 0.0789, 0.0123, 0.0789, a[-1],  # type: ignore
+        0.0123,
+        0.0456,
+        0.0789,
+        0.0123,
+        0.0789,
+        a[-1],  # type: ignore
     )
 
     # The type: ignore exception only applies to line length, not

tests/data/expression.diff

@@ -130,37 +130,25 @@
  call(**self.screen_kwargs)
  call(b, **self.screen_kwargs)
  lukasz.langa.pl
-@@ -94,23 +127,25 @@
+@@ -94,11 +127,16 @@
  1.0 .real
  ....__class__
  list[str]
  dict[str, int]
  tuple[str, ...]
 -tuple[str, int, float, dict[str, int],]
 +tuple[
-+    str, int, float, dict[str, int],
++    str,
++    int,
++    float,
++    dict[str, int],
 +]
  very_long_variable_name_filters: t.List[
      t.Tuple[str, t.Union[str, t.List[t.Optional[str]]]],
  ]
  xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(  # type: ignore
      sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)
- )
- xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(  # type: ignore
-     sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)
- )
--xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[
--    ..., List[SomeClass]
--] = classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))  # type: ignore
-+xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(
-+    sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)
-+)  # type: ignore
- slice[0]
- slice[0:1]
- slice[0:1:2]
- slice[:]
- slice[:-1]
-@@ -134,113 +169,171 @@
+@@ -132,113 +170,171 @@
  numpy[-(c + 1) :, d]
  numpy[:, l[-2]]
  numpy[:, ::-1]
@@ -404,4 +392,3 @@
      return True
  last_call()
  # standalone comment at ENDMARKER
-

tests/data/expression.py

@@ -106,9 +106,7 @@
 xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(  # type: ignore
     sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)
 )
-xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[
-    ..., List[SomeClass]
-] = classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))  # type: ignore
+xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))  # type: ignore
 slice[0]
 slice[0:1]
 slice[0:1:2]
@@ -380,7 +378,10 @@ async def f():
 dict[str, int]
 tuple[str, ...]
 tuple[
-    str, int, float, dict[str, int],
+    str,
+    int,
+    float,
+    dict[str, int],
 ]
 very_long_variable_name_filters: t.List[
     t.Tuple[str, t.Union[str, t.List[t.Optional[str]]]],
@@ -391,9 +392,7 @@ async def f():
 xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(  # type: ignore
     sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)
 )
-xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(
-    sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__)
-)  # type: ignore
+xxxx_xxx_xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod(sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__))  # type: ignore
 slice[0]
 slice[0:1]
 slice[0:1:2]

tests/data/function.py

@@ -82,8 +82,7 @@ def trailing_comma():
     D: 0.1 * (10.0 / 12),
 }
 def f(
-  a,
-  **kwargs,
+  a, **kwargs,
 ) -> A:
     return (
         yield from A(
@@ -230,7 +229,10 @@ def trailing_comma():
     }
 
 
-def f(a, **kwargs,) -> A:
+def f(
+    a,
+    **kwargs,
+) -> A:
     return (
         yield from A(
             very_long_argument_name1=very_long_value_for_the_argument,

tests/data/function2.py

@@ -25,7 +25,10 @@ def inner():
 
 # output
 
-def f(a, **kwargs,) -> A:
+def f(
+    a,
+    **kwargs,
+) -> A:
     with cache_dir():
         if something:
             result = CliRunner().invoke(

tests/data/function_trailing_comma.py

@@ -11,11 +11,15 @@ def xxxxxxxxxxxxxxxxxxxxxxxxxxxx() -> Set[
 
 # output
 
-def f(a,):
+def f(
+    a,
+):
     ...
 
 
-def f(a: int = 1,):
+def f(
+    a: int = 1,
+):
     ...
 
 

tests/data/remove_parens.py

@@ -55,6 +55,18 @@ def example8():
     return (((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((None)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
 
 
+def example_tuple():
+    return ((((1, 2, 3))))
+
+
+def example_tuple_trailing_comma():
+    return (((1, 2, 3,)))
+
+
+def example_list():
+    return ((([1, 2, 3])))
+
+
 # output
 x = 1
 x = 1.2
@@ -142,3 +154,18 @@ def example7():
 def example8():
     return None
 
+
+def example_tuple():
+    return (1, 2, 3)
+
+
+def example_tuple_trailing_comma():
+    return (
+        1,
+        2,
+        3,
+    )
+
+
+def example_list():
+    return [1, 2, 3]

tests/data/tupleassign.py

@@ -15,7 +15,7 @@
     sdfjsdfjlksdljkfsdlkf,
     sdfsdjfklsdfjlksdljkf,
     sdsfsdfjskdflsfsdf,
-) = (1, 2, 3)
+) = 1, 2, 3
 
 # This is as well.
 (this_will_be_wrapped_in_parens,) = struct.unpack(b"12345678901234567890")