Skip to content
This repository was archived by the owner on Jul 11, 2022. It is now read-only.

Commit fb84d8b

Browse files
committed
Fix numpy-style array indexing
Fixes pytest-dev#33
1 parent 907dc6c commit fb84d8b

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

black.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,14 @@ def whitespace(leaf: Leaf) -> str:
960960

961961
elif p.type == syms.subscript:
962962
# indexing
963-
if not prev or prev.type == token.COLON:
963+
if not prev:
964+
assert p.parent is not None, "subscripts are always parented"
965+
if p.parent.type == syms.subscriptlist:
966+
return SPACE
967+
968+
return NO
969+
970+
elif prev.type == token.COLON:
964971
return NO
965972

966973
elif p.type == syms.atom:

tests/expression.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
slice[:-1]
8989
slice[1:]
9090
slice[::-1]
91+
numpy[:, 0:1]
9192
(str or None) if (sys.version_info[0] > (3,)) else (str or bytes or None)
9293
{'2.7': dead, '3.7': long_live or die_hard}
9394
{'2.7', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'}
@@ -219,6 +220,7 @@ async def f():
219220
slice[:-1]
220221
slice[1:]
221222
slice[::-1]
223+
numpy[:, 0:1]
222224
(str or None) if (sys.version_info[0] > (3,)) else (str or bytes or None)
223225
{'2.7': dead, '3.7': long_live or die_hard}
224226
{'2.7', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'}

0 commit comments

Comments
 (0)