Loading README.md +5 −0 Changes for README.md: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -251,6 +251,11 @@ You can still try but prepare to be disappointed. ## Change Log ### 18.3a1 * fixed invalid spacing of dots in relative imports (#6, #13) ### 18.3a0 * first published version, Happy 🍰 Day 2018! Loading black.py +13 −3 Changes for black.py: 13 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -20,7 +20,7 @@ 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 Loading Loading @@ -765,6 +765,7 @@ def whitespace(leaf: Leaf) -> str: DOUBLESPACE = ' ' t = leaf.type p = leaf.parent v = leaf.value if t == token.COLON: return NO Loading Loading @@ -867,7 +868,7 @@ def whitespace(leaf: Leaf) -> str: 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: Loading Loading @@ -987,7 +988,16 @@ def whitespace(leaf: Leaf) -> str: elif t == token.NAME or t == token.NUMBER: return NO elif p.type == syms.import_from and t == token.NAME: 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 Loading tests/import_spacing.py +12 −18 Changes for tests/import_spacing.py: 12 added lines, 18 removed lines. Original line number Diff line number Diff line Loading @@ -13,13 +13,12 @@ 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__ + Loading @@ -31,9 +30,7 @@ runners.__all__ + queues.__all__ + streams.__all__ + subprocess.__all__ + tasks.__all__ + transports.__all__ tasks.__all__ ) Loading @@ -53,13 +50,12 @@ 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__ + Loading @@ -71,7 +67,5 @@ runners.__all__ + queues.__all__ + streams.__all__ + subprocess.__all__ + tasks.__all__ + transports.__all__ tasks.__all__ ) Loading
README.md +5 −0 Changes for README.md: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -251,6 +251,11 @@ You can still try but prepare to be disappointed. ## Change Log ### 18.3a1 * fixed invalid spacing of dots in relative imports (#6, #13) ### 18.3a0 * first published version, Happy 🍰 Day 2018! Loading
black.py +13 −3 Changes for black.py: 13 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -20,7 +20,7 @@ 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 Loading Loading @@ -765,6 +765,7 @@ def whitespace(leaf: Leaf) -> str: DOUBLESPACE = ' ' t = leaf.type p = leaf.parent v = leaf.value if t == token.COLON: return NO Loading Loading @@ -867,7 +868,7 @@ def whitespace(leaf: Leaf) -> str: 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: Loading Loading @@ -987,7 +988,16 @@ def whitespace(leaf: Leaf) -> str: elif t == token.NAME or t == token.NUMBER: return NO elif p.type == syms.import_from and t == token.NAME: 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 Loading
tests/import_spacing.py +12 −18 Changes for tests/import_spacing.py: 12 added lines, 18 removed lines. Original line number Diff line number Diff line Loading @@ -13,13 +13,12 @@ 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__ + Loading @@ -31,9 +30,7 @@ runners.__all__ + queues.__all__ + streams.__all__ + subprocess.__all__ + tasks.__all__ + transports.__all__ tasks.__all__ ) Loading @@ -53,13 +50,12 @@ 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__ + Loading @@ -71,7 +67,5 @@ runners.__all__ + queues.__all__ + streams.__all__ + subprocess.__all__ + tasks.__all__ + transports.__all__ tasks.__all__ )