PyPI downloads badge

[etc/vim.git] / black.py

diff --git a/black.py b/black.py
index 9b363d5041f2528c063fc70aadc14937f37bb781..d6887483903ff3282d6e1f63b071a7c587b21178 100644 (file)
--- a/black.py
+++ b/black.py
@@ -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."""
-    # We want all letters (e in exponents, j in complex literals, a-f
-    # in hex literals) to be lowercase.
+    """Normalizes numeric (float, int, and complex) literals.
+
+    All letters used in the representation are normalized to lowercase, long number
+    literals are split using underscores.
+    """

     text = leaf.value.lower()
     if text.startswith(("0o", "0x", "0b")):
     text = leaf.value.lower()
     if text.startswith(("0o", "0x", "0b")):

-        # Leave octal, hex, and binary literals alone for now.
+        # Leave octal, hex, and binary literals alone.

         pass
     elif "e" in text:
         before, after = text.split("e")
         pass
     elif "e" in text:
         before, after = text.split("e")

+        sign = ""

         if after.startswith("-"):
             after = after[1:]
             sign = "-"
         elif after.startswith("+"):
             after = after[1:]
         if after.startswith("-"):
             after = after[1:]
             sign = "-"
         elif after.startswith("+"):
             after = after[1:]

-            sign = ""
-        else:
-            sign = ""

         before = format_float_or_int_string(before, allow_underscores)
         after = format_int_string(after, allow_underscores)
         text = f"{before}e{sign}{after}"
         before = format_float_or_int_string(before, allow_underscores)
         after = format_int_string(after, allow_underscores)
         text = f"{before}e{sign}{after}"

-    # Complex numbers and Python 2 longs
-    elif "j" in text or "l" in text:
+    elif text.endswith(("j", "l")):

         number = text[:-1]
         suffix = text[-1]
         text = f"{format_float_or_int_string(number, allow_underscores)}{suffix}"
         number = text[:-1]
         suffix = text[-1]
         text = f"{format_float_or_int_string(number, allow_underscores)}{suffix}"


@@ -2545,6 +2544,7 @@ def format_float_or_int_string(text: str, allow_underscores: bool) -> str:
     """Formats a float string like "1.0"."""
     if "." not in text:
         return format_int_string(text, allow_underscores)
     """Formats a float string like "1.0"."""
     if "." not in text:
         return format_int_string(text, allow_underscores)

+

     before, after = text.split(".")
     before = format_int_string(before, allow_underscores) if before else "0"
     after = format_int_string(after, allow_underscores) if after else "0"
     before, after = text.split(".")
     before = format_int_string(before, allow_underscores) if before else "0"
     after = format_int_string(after, allow_underscores) if after else "0"


@@ -2554,14 +2554,16 @@ def format_float_or_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.
 
 def format_int_string(text: str, allow_underscores: bool) -> str:
     """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:
         return text
     """
     if not allow_underscores:
         return text

+

     text = text.replace("_", "")
     if len(text) <= 6:
         # No underscores for numbers <= 6 digits long.
         return text
     text = text.replace("_", "")
     if len(text) <= 6:
         # No underscores for numbers <= 6 digits long.
         return text

+

     return format(int(text), "3_")
 
 
     return format(int(text), "3_")