Fix invalid spacing of dots in relative imports

Fixes #6
Fixes #13

diff --git a/README.md b/README.md
index 56321c7a5b92f19d00325dadc95eccf418c6f09f..28f79db404736a55042fd127f1ad483b44be6924 100644 (file)
--- a/README.md
+++ b/README.md
@@ -251,6 +251,11 @@ You can still try but prepare to be disappointed.
 
 ## Change Log
 
 
 ## Change Log
 

+### 18.3a1
+
+* fixed invalid spacing of dots in relative imports (#6, #13)
+
+

 ### 18.3a0
 
 * first published version, Happy 🍰 Day 2018!
 ### 18.3a0
 
 * first published version, Happy 🍰 Day 2018!

diff --git a/black.py b/black.py
index 24c57ca4aee1d54ae862e8e879a4d27f9577f029..7ae2627769fcdabae7358002564006681ead84b5 100644 (file)
--- a/black.py
+++ b/black.py
@@ -20,7 +20,7 @@ from blib2to3 import pygram, pytree
 from blib2to3.pgen2 import driver, token
 from blib2to3.pgen2.parse import ParseError
 
 from blib2to3.pgen2 import driver, token
 from blib2to3.pgen2.parse import ParseError
 

-__version__ = "18.3a0"
+__version__ = "18.3a1"

 DEFAULT_LINE_LENGTH = 88
 # types
 syms = pygram.python_symbols
 DEFAULT_LINE_LENGTH = 88
 # types
 syms = pygram.python_symbols


@@ -765,6 +765,7 @@ def whitespace(leaf: Leaf) -> str:
     DOUBLESPACE = '  '
     t = leaf.type
     p = leaf.parent
     DOUBLESPACE = '  '
     t = leaf.type
     p = leaf.parent

+    v = leaf.value

     if t == token.COLON:
         return NO
 
     if t == token.COLON:
         return NO
 


@@ -867,7 +868,7 @@ def whitespace(leaf: Leaf) -> str:
             return NO
 
         prevp = preceding_leaf(p)
             return NO
 
         prevp = preceding_leaf(p)

-        if not prevp or prevp.type == token.AT:
+        if not prevp or prevp.type == token.AT or prevp.type == token.DOT:

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


@@ -987,10 +988,19 @@ def whitespace(leaf: Leaf) -> str:
         elif t == token.NAME or t == token.NUMBER:
             return NO
 
         elif t == token.NAME or t == token.NUMBER:
             return NO
 

-    elif p.type == syms.import_from and t == token.NAME:
-        prev = leaf.prev_sibling
-        if prev and prev.type == token.DOT:
-            return NO
+    elif p.type == syms.import_from:
+        if t == token.DOT:
+            prev = leaf.prev_sibling
+            if prev and prev.type == token.DOT:
+                return NO
+
+        elif t == token.NAME:
+            if v == 'import':
+                return SPACE
+
+            prev = leaf.prev_sibling
+            if prev and prev.type == token.DOT:
+                return NO

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

diff --git a/tests/import_spacing.py b/tests/import_spacing.py
index 0597b62b01151ebf4c08055fd0fa0489f3303c90..a9856e7319a9fd2b54d0a82301b30c7c771ae563 100644 (file)
--- a/tests/import_spacing.py
+++ b/tests/import_spacing.py
@@ -13,13 +13,12 @@ from .futures import *
 from .locks import *  # comment here
 from .protocols import *
 
 from .locks import *  # comment here
 from .protocols import *
 

-from .runners import *  # comment here
-from .queues import *
-from .streams import *
+from ..runners import *  # comment here
+from ..queues import *
+from ..streams import *

 
 

-from .subprocess import *
-from .tasks import *
-from .transports import *
+from .a.b.c.subprocess import *
+from . import tasks

 
 __all__ = (
     base_events.__all__ +
 
 __all__ = (
     base_events.__all__ +


@@ -31,9 +30,7 @@ __all__ = (
     runners.__all__ +
     queues.__all__ +
     streams.__all__ +
     runners.__all__ +
     queues.__all__ +
     streams.__all__ +

-    subprocess.__all__ +
-    tasks.__all__ +
-    transports.__all__
+    tasks.__all__

 )
 
 
 )
 
 


@@ -53,13 +50,12 @@ from .futures import *
 from .locks import *  # comment here
 from .protocols import *
 
 from .locks import *  # comment here
 from .protocols import *
 

-from .runners import *  # comment here
-from .queues import *
-from .streams import *
+from ..runners import *  # comment here
+from ..queues import *
+from ..streams import *

 
 

-from .subprocess import *
-from .tasks import *
-from .transports import *
+from .a.b.c.subprocess import *
+from . import tasks

 
 __all__ = (
     base_events.__all__ +
 
 __all__ = (
     base_events.__all__ +


@@ -71,7 +67,5 @@ __all__ = (
     runners.__all__ +
     queues.__all__ +
     streams.__all__ +
     runners.__all__ +
     queues.__all__ +
     streams.__all__ +

-    subprocess.__all__ +
-    tasks.__all__ +
-    transports.__all__
+    tasks.__all__

 )
 )