actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix numpy-style array indexing for real

Browse Source 
Fixes #33
This commit is contained in:
Łukasz Langa 2018-03-20 18:17:20 -07:00
parent e911c79809
commit 5bc40707af
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -267,6 +267,8 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
* restored ability to format code with legacy usage of `async` as * restored ability to format code with legacy usage of `async` as
a name (#20, #42) a name (#20, #42)
* even better handling of numpy-style array indexing (#33, again)
### 18.3a2 ### 18.3a2

4
black.py
View File

@ -872,7 +872,7 @@ def whitespace(leaf: Leaf) -> str: # noqa C901
return DOUBLESPACE return DOUBLESPACE
assert p is not None, f"INTERNAL ERROR: hand-made leaf without parent: {leaf!r}" assert p is not None, f"INTERNAL ERROR: hand-made leaf without parent: {leaf!r}"
if t == token.COLON and p.type != syms.subscript: if t == token.COLON and p.type not in {syms.subscript, syms.subscriptlist}:
return NO return NO
prev = leaf.prev_sibling prev = leaf.prev_sibling
@ -905,7 +905,7 @@ def whitespace(leaf: Leaf) -> str: # noqa C901
return NO return NO
elif prevp.type == token.COLON: elif prevp.type == token.COLON:
if prevp.parent and prevp.parent.type == syms.subscript: if prevp.parent and prevp.parent.type in {syms.subscript, syms.sliceop}:
return NO return NO
elif prevp.parent and prevp.parent.type in {syms.factor, syms.star_expr}: elif prevp.parent and prevp.parent.type in {syms.factor, syms.star_expr}:

34
tests/expression.py
View File

@ -89,8 +89,25 @@
slice[:-1] slice[:-1]
slice[1:] slice[1:]
slice[::-1] slice[::-1]
slice[d::d + 1]
slice[:c, c - 1]
numpy[:, 0:1] numpy[:, 0:1]
numpy[:, :-1] numpy[:, :-1]
numpy[0, :]
numpy[:, i]
numpy[0, :2]
numpy[:N, 0]
numpy[:2, :4]
numpy[2:4, 1:5]
numpy[4:, 2:]
numpy[:, (0, 1, 2, 5)]
numpy[0, [0]]
numpy[:, [i]]
numpy[1:c + 1, c]
numpy[-(c + 1):, d]
numpy[:, l[-2]]
numpy[:, ::-1]
numpy[np.newaxis, :]
(str or None) if (sys.version_info[0] > (3,)) else (str or bytes or None) (str or None) if (sys.version_info[0] > (3,)) else (str or bytes or None)
{'2.7': dead, '3.7': long_live or die_hard} {'2.7': dead, '3.7': long_live or die_hard}
{'2.7', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'} {'2.7', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'}
@ -232,8 +249,25 @@ async def f():
slice[:-1] slice[:-1]
slice[1:] slice[1:]
slice[::-1] slice[::-1]
slice[d::d + 1]
slice[:c, c - 1]
numpy[:, 0:1] numpy[:, 0:1]
numpy[:, :-1] numpy[:, :-1]
numpy[0, :]
numpy[:, i]
numpy[0, :2]
numpy[:N, 0]
numpy[:2, :4]
numpy[2:4, 1:5]
numpy[4:, 2:]
numpy[:, (0, 1, 2, 5)]
numpy[0, [0]]
numpy[:, [i]]
numpy[1:c + 1, c]
numpy[-(c + 1):, d]
numpy[:, l[-2]]
numpy[:, ::-1]
numpy[np.newaxis, :]
(str or None) if (sys.version_info[0] > (3,)) else (str or bytes or None) (str or None) if (sys.version_info[0] > (3,)) else (str or bytes or None)
{'2.7': dead, '3.7': long_live or die_hard} {'2.7': dead, '3.7': long_live or die_hard}
{'2.7', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'} {'2.7', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'}