Fix numpy-style array indexing

Fixes #33

diff --git a/black.py b/black.py
index 51b5b218889975090b41621c9e25ff0ae94c3a54..d011483747546de1b3248dff21a88b52f9ad4649 100644 (file)
--- a/black.py
+++ b/black.py
@@ -960,7 +960,14 @@ def whitespace(leaf: Leaf) -> str:
 
     elif p.type == syms.subscript:
         # indexing
 
     elif p.type == syms.subscript:
         # indexing

-        if not prev or prev.type == token.COLON:
+        if not prev:
+            assert p.parent is not None, "subscripts are always parented"
+            if p.parent.type == syms.subscriptlist:
+                return SPACE
+
+            return NO
+
+        elif prev.type == token.COLON:

             return NO
 
     elif p.type == syms.atom:
             return NO
 
     elif p.type == syms.atom:

diff --git a/tests/expression.py b/tests/expression.py
index a3c810ee9f92883ff9248551670a80a9d9a1b3bb..30a20e977045fa7743765cf32df71813fdd6a36f 100644 (file)
--- a/tests/expression.py
+++ b/tests/expression.py
@@ -88,6 +88,7 @@ slice[:]
 slice[:-1]
 slice[1:]
 slice[::-1]
 slice[:-1]
 slice[1:]
 slice[::-1]

+numpy[:, 0:1]

 (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', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'}
 (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', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'}


@@ -219,6 +220,7 @@ slice[:]
 slice[:-1]
 slice[1:]
 slice[::-1]
 slice[:-1]
 slice[1:]
 slice[::-1]

+numpy[:, 0:1]

 (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', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'}
 (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', '3.6', '3.7', '3.8', '3.9', '4.0' if gilectomy else '3.10'}