Loading README.md +10 −0 Changes for README.md: 10 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -381,6 +381,11 @@ styled as `2L` instead of `2l` to avoid confusion between `l` and `1`. In Python 3.6+, *Black* adds underscores to long numeric literals to aid readability: `100000000` becomes `100_000_000`. For regions where numerals are grouped differently (like [India](https://en.wikipedia.org/wiki/Indian_numbering_system) and [China](https://en.wikipedia.org/wiki/Chinese_numerals#Whole_numbers)), the `-N` or `--skip-numeric-underscore-normalization` command line option makes *Black* preserve underscores in numeric literals. ### Line breaks & binary operators *Black* will break a line before a binary operator when splitting a block Loading Loading @@ -796,6 +801,8 @@ The headers controlling how code is formatted are: - `X-Skip-String-Normalization`: corresponds to the `--skip-string-normalization` command line flag. If present and its value is not the empty string, no string normalization will be performed. - `X-Skip-Numeric-Underscore-Normalization`: corresponds to the `--skip-numeric-underscore-normalization` command line flag. - `X-Fast-Or-Safe`: if set to `fast`, `blackd` will act as *Black* does when passed the `--fast` command line flag. - `X-Python-Variant`: if set to `pyi`, `blackd` will act as *Black* does when Loading Loading @@ -926,6 +933,9 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md). * numeric literals are normalized to include `_` separators on Python 3.6+ code * added `--skip-numeric-underscore-normalization` to disable the above behavior and leave numeric underscores as they were in the input * code with `_` in numeric literals is recognized as Python 3.6+ * most letters in numeric literals are lowercased (e.g., in `1e10` or `0xab`) Loading black.py +24 −5 Changes for black.py: 24 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -115,10 +115,16 @@ class FileMode(Flag): PYTHON36 = 1 PYI = 2 NO_STRING_NORMALIZATION = 4 NO_NUMERIC_UNDERSCORE_NORMALIZATION = 8 @classmethod def from_configuration( cls, *, py36: bool, pyi: bool, skip_string_normalization: bool cls, *, py36: bool, pyi: bool, skip_string_normalization: bool, skip_numeric_underscore_normalization: bool, ) -> "FileMode": mode = cls.AUTO_DETECT if py36: Loading @@ -127,6 +133,8 @@ def from_configuration( mode |= cls.PYI if skip_string_normalization: mode |= cls.NO_STRING_NORMALIZATION if skip_numeric_underscore_normalization: mode |= cls.NO_NUMERIC_UNDERSCORE_NORMALIZATION return mode Loading Loading @@ -196,6 +204,12 @@ def read_pyproject_toml( is_flag=True, help="Don't normalize string quotes or prefixes.", ) @click.option( "-N", "--skip-numeric-underscore-normalization", is_flag=True, help="Don't normalize underscores in numeric literals.", ) @click.option( "--check", is_flag=True, Loading Loading @@ -286,6 +300,7 @@ def main( pyi: bool, py36: bool, skip_string_normalization: bool, skip_numeric_underscore_normalization: bool, quiet: bool, verbose: bool, include: str, Loading @@ -296,7 +311,10 @@ def main( """The uncompromising code formatter.""" write_back = WriteBack.from_configuration(check=check, diff=diff) mode = FileMode.from_configuration( py36=py36, pyi=pyi, skip_string_normalization=skip_string_normalization py36=py36, pyi=pyi, skip_string_normalization=skip_string_normalization, skip_numeric_underscore_normalization=skip_numeric_underscore_normalization, ) if config and verbose: out(f"Using configuration from {config}.", bold=False, fg="blue") Loading Loading @@ -618,7 +636,8 @@ def format_str( remove_u_prefix=py36 or "unicode_literals" in future_imports, is_pyi=is_pyi, normalize_strings=normalize_strings, allow_underscores=py36, allow_underscores=py36 and not bool(mode & FileMode.NO_NUMERIC_UNDERSCORE_NORMALIZATION), ) elt = EmptyLineTracker(is_pyi=is_pyi) empty_line = Line() Loading Loading @@ -2600,8 +2619,8 @@ def format_int_string( return text text = text.replace("_", "") if len(text) <= 6: # No underscores for numbers <= 6 digits long. if len(text) <= 5: # No underscores for numbers <= 5 digits long. return text if count_from_end: Loading blackd.py +8 −1 Changes for blackd.py: 8 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -14,6 +14,7 @@ LINE_LENGTH_HEADER = "X-Line-Length" PYTHON_VARIANT_HEADER = "X-Python-Variant" SKIP_STRING_NORMALIZATION_HEADER = "X-Skip-String-Normalization" SKIP_NUMERIC_UNDERSCORE_NORMALIZATION_HEADER = "X-Skip-Numeric-Underscore-Normalization" FAST_OR_SAFE_HEADER = "X-Fast-Or-Safe" Loading Loading @@ -69,11 +70,17 @@ async def handle(request: web.Request, executor: Executor) -> web.Response: skip_string_normalization = bool( request.headers.get(SKIP_STRING_NORMALIZATION_HEADER, False) ) skip_numeric_underscore_normalization = bool( request.headers.get(SKIP_NUMERIC_UNDERSCORE_NORMALIZATION_HEADER, False) ) fast = False if request.headers.get(FAST_OR_SAFE_HEADER, "safe") == "fast": fast = True mode = black.FileMode.from_configuration( py36=py36, pyi=pyi, skip_string_normalization=skip_string_normalization py36=py36, pyi=pyi, skip_string_normalization=skip_string_normalization, skip_numeric_underscore_normalization=skip_numeric_underscore_normalization, ) req_bytes = await request.content.read() charset = request.charset if request.charset is not None else "utf8" Loading tests/data/fmtonoff.py +1 −1 Changes for tests/data/fmtonoff.py: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -225,7 +225,7 @@ def function_signature_stress_test(number:int,no_annotation=None,text:str='defau return text[number:-1] # fmt: on def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""): offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000))) offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200_000))) assert task._cancel_stack[: len(old_stack)] == old_stack Loading tests/data/function.py +1 −1 Changes for tests/data/function.py: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -144,7 +144,7 @@ def function_signature_stress_test( def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""): offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000))) offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200_000))) assert task._cancel_stack[: len(old_stack)] == old_stack Loading Loading
README.md +10 −0 Changes for README.md: 10 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -381,6 +381,11 @@ styled as `2L` instead of `2l` to avoid confusion between `l` and `1`. In Python 3.6+, *Black* adds underscores to long numeric literals to aid readability: `100000000` becomes `100_000_000`. For regions where numerals are grouped differently (like [India](https://en.wikipedia.org/wiki/Indian_numbering_system) and [China](https://en.wikipedia.org/wiki/Chinese_numerals#Whole_numbers)), the `-N` or `--skip-numeric-underscore-normalization` command line option makes *Black* preserve underscores in numeric literals. ### Line breaks & binary operators *Black* will break a line before a binary operator when splitting a block Loading Loading @@ -796,6 +801,8 @@ The headers controlling how code is formatted are: - `X-Skip-String-Normalization`: corresponds to the `--skip-string-normalization` command line flag. If present and its value is not the empty string, no string normalization will be performed. - `X-Skip-Numeric-Underscore-Normalization`: corresponds to the `--skip-numeric-underscore-normalization` command line flag. - `X-Fast-Or-Safe`: if set to `fast`, `blackd` will act as *Black* does when passed the `--fast` command line flag. - `X-Python-Variant`: if set to `pyi`, `blackd` will act as *Black* does when Loading Loading @@ -926,6 +933,9 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md). * numeric literals are normalized to include `_` separators on Python 3.6+ code * added `--skip-numeric-underscore-normalization` to disable the above behavior and leave numeric underscores as they were in the input * code with `_` in numeric literals is recognized as Python 3.6+ * most letters in numeric literals are lowercased (e.g., in `1e10` or `0xab`) Loading
black.py +24 −5 Changes for black.py: 24 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -115,10 +115,16 @@ class FileMode(Flag): PYTHON36 = 1 PYI = 2 NO_STRING_NORMALIZATION = 4 NO_NUMERIC_UNDERSCORE_NORMALIZATION = 8 @classmethod def from_configuration( cls, *, py36: bool, pyi: bool, skip_string_normalization: bool cls, *, py36: bool, pyi: bool, skip_string_normalization: bool, skip_numeric_underscore_normalization: bool, ) -> "FileMode": mode = cls.AUTO_DETECT if py36: Loading @@ -127,6 +133,8 @@ def from_configuration( mode |= cls.PYI if skip_string_normalization: mode |= cls.NO_STRING_NORMALIZATION if skip_numeric_underscore_normalization: mode |= cls.NO_NUMERIC_UNDERSCORE_NORMALIZATION return mode Loading Loading @@ -196,6 +204,12 @@ def read_pyproject_toml( is_flag=True, help="Don't normalize string quotes or prefixes.", ) @click.option( "-N", "--skip-numeric-underscore-normalization", is_flag=True, help="Don't normalize underscores in numeric literals.", ) @click.option( "--check", is_flag=True, Loading Loading @@ -286,6 +300,7 @@ def main( pyi: bool, py36: bool, skip_string_normalization: bool, skip_numeric_underscore_normalization: bool, quiet: bool, verbose: bool, include: str, Loading @@ -296,7 +311,10 @@ def main( """The uncompromising code formatter.""" write_back = WriteBack.from_configuration(check=check, diff=diff) mode = FileMode.from_configuration( py36=py36, pyi=pyi, skip_string_normalization=skip_string_normalization py36=py36, pyi=pyi, skip_string_normalization=skip_string_normalization, skip_numeric_underscore_normalization=skip_numeric_underscore_normalization, ) if config and verbose: out(f"Using configuration from {config}.", bold=False, fg="blue") Loading Loading @@ -618,7 +636,8 @@ def format_str( remove_u_prefix=py36 or "unicode_literals" in future_imports, is_pyi=is_pyi, normalize_strings=normalize_strings, allow_underscores=py36, allow_underscores=py36 and not bool(mode & FileMode.NO_NUMERIC_UNDERSCORE_NORMALIZATION), ) elt = EmptyLineTracker(is_pyi=is_pyi) empty_line = Line() Loading Loading @@ -2600,8 +2619,8 @@ def format_int_string( return text text = text.replace("_", "") if len(text) <= 6: # No underscores for numbers <= 6 digits long. if len(text) <= 5: # No underscores for numbers <= 5 digits long. return text if count_from_end: Loading
blackd.py +8 −1 Changes for blackd.py: 8 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -14,6 +14,7 @@ LINE_LENGTH_HEADER = "X-Line-Length" PYTHON_VARIANT_HEADER = "X-Python-Variant" SKIP_STRING_NORMALIZATION_HEADER = "X-Skip-String-Normalization" SKIP_NUMERIC_UNDERSCORE_NORMALIZATION_HEADER = "X-Skip-Numeric-Underscore-Normalization" FAST_OR_SAFE_HEADER = "X-Fast-Or-Safe" Loading Loading @@ -69,11 +70,17 @@ async def handle(request: web.Request, executor: Executor) -> web.Response: skip_string_normalization = bool( request.headers.get(SKIP_STRING_NORMALIZATION_HEADER, False) ) skip_numeric_underscore_normalization = bool( request.headers.get(SKIP_NUMERIC_UNDERSCORE_NORMALIZATION_HEADER, False) ) fast = False if request.headers.get(FAST_OR_SAFE_HEADER, "safe") == "fast": fast = True mode = black.FileMode.from_configuration( py36=py36, pyi=pyi, skip_string_normalization=skip_string_normalization py36=py36, pyi=pyi, skip_string_normalization=skip_string_normalization, skip_numeric_underscore_normalization=skip_numeric_underscore_normalization, ) req_bytes = await request.content.read() charset = request.charset if request.charset is not None else "utf8" Loading
tests/data/fmtonoff.py +1 −1 Changes for tests/data/fmtonoff.py: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -225,7 +225,7 @@ def function_signature_stress_test(number:int,no_annotation=None,text:str='defau return text[number:-1] # fmt: on def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""): offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000))) offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200_000))) assert task._cancel_stack[: len(old_stack)] == old_stack Loading
tests/data/function.py +1 −1 Changes for tests/data/function.py: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -144,7 +144,7 @@ def function_signature_stress_test( def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""): offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000))) offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200_000))) assert task._cancel_stack[: len(old_stack)] == old_stack Loading