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

Nits around numeral normalization.

Browse Source
This commit is contained in:
Łukasz Langa 2018-08-17 10:38:28 -07:00
parent 71bdd727a8
commit 2a357b3606
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
black.py
View File

@ -2511,28 +2511,27 @@ def normalize_string_quotes(leaf: Leaf) -> None:
def normalize_numeric_literal(leaf: Leaf, allow_underscores: bool) -> None: def normalize_numeric_literal(leaf: Leaf, allow_underscores: bool) -> None:
"""Normalizes numeric (float, int, and complex) literals.""" """Normalizes numeric (float, int, and complex) literals.
# We want all letters (e in exponents, j in complex literals, a-f
# in hex literals) to be lowercase. All letters used in the representation are normalized to lowercase, long number
literals are split using underscores.
"""
text = leaf.value.lower() text = leaf.value.lower()
if text.startswith(("0o", "0x", "0b")): if text.startswith(("0o", "0x", "0b")):
# Leave octal, hex, and binary literals alone for now. # Leave octal, hex, and binary literals alone.
pass pass
elif "e" in text: elif "e" in text:
before, after = text.split("e") before, after = text.split("e")
sign = ""
if after.startswith("-"): if after.startswith("-"):
after = after[1:] after = after[1:]
sign = "-" sign = "-"
elif after.startswith("+"): elif after.startswith("+"):
after = after[1:] after = after[1:]
sign = ""
else:
sign = ""
before = format_float_or_int_string(before, allow_underscores) before = format_float_or_int_string(before, allow_underscores)
after = format_int_string(after, allow_underscores) after = format_int_string(after, allow_underscores)
text = f"{before}e{sign}{after}" text = f"{before}e{sign}{after}"
# Complex numbers and Python 2 longs elif text.endswith(("j", "l")):
elif "j" in text or "l" in text:
number = text[:-1] number = text[:-1]
suffix = text[-1] suffix = text[-1]
text = f"{format_float_or_int_string(number, allow_underscores)}{suffix}" text = f"{format_float_or_int_string(number, allow_underscores)}{suffix}"
@ -2555,7 +2554,7 @@ def format_float_or_int_string(text: str, allow_underscores: bool) -> str:
def format_int_string(text: str, allow_underscores: bool) -> str: def format_int_string(text: str, allow_underscores: bool) -> str:
"""Normalizes underscores in a string to e.g. 1_000_000. """Normalizes underscores in a string to e.g. 1_000_000.
Input must be a string consisting only of digits and underscores. Input must be a string of at least six digits and optional underscores.
""" """
if not allow_underscores: if not allow_underscores:
return text return text