Skip to content

Commit

Permalink
Revert "Use lowercase hex numbers fixes #1692 (#1775)"
Browse files Browse the repository at this point in the history
This reverts commit 7d032fa.
  • Loading branch information
ambv committed Apr 25, 2021
1 parent 368f043 commit 773e4a2
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 22 deletions.
3 changes: 1 addition & 2 deletions .gitignore
@@ -1,4 +1,3 @@
.venv
.coverage
_build
.DS_Store
Expand All @@ -16,4 +15,4 @@ src/_black_version.py
.dmypy.json
*.swp
.hypothesis/
venv/
venv/
9 changes: 2 additions & 7 deletions src/black/__init__.py
Expand Up @@ -5351,15 +5351,10 @@ def normalize_numeric_literal(leaf: Leaf) -> None:

def format_hex(text: str) -> str:
"""
Formats a hexadecimal string like "0x12b3"
Uses lowercase because of similarity between "B" and "8", which
can cause security issues.
see: https://github.com/psf/black/issues/1692
Formats a hexadecimal string like "0x12B3"
"""

before, after = text[:2], text[2:]
return f"{before}{after.lower()}"
return f"{before}{after.upper()}"


def format_scientific_notation(text: str) -> str:
Expand Down
10 changes: 5 additions & 5 deletions src/black_primer/primer.json
Expand Up @@ -10,7 +10,7 @@
},
"attrs": {
"cli_arguments": [],
"expect_formatting_changes": true,
"expect_formatting_changes": false,
"git_clone_url": "https://github.com/python-attrs/attrs.git",
"long_checkout": false,
"py_versions": ["all"]
Expand Down Expand Up @@ -47,7 +47,7 @@
},
"hypothesis": {
"cli_arguments": [],
"expect_formatting_changes": true,
"expect_formatting_changes": false,
"git_clone_url": "https://github.com/HypothesisWorks/hypothesis.git",
"long_checkout": false,
"py_versions": ["all"]
Expand All @@ -63,7 +63,7 @@
},
"pillow": {
"cli_arguments": [],
"expect_formatting_changes": true,
"expect_formatting_changes": false,
"git_clone_url": "https://github.com/python-pillow/Pillow.git",
"long_checkout": false,
"py_versions": ["all"]
Expand All @@ -77,7 +77,7 @@
},
"pyramid": {
"cli_arguments": [],
"expect_formatting_changes": true,
"expect_formatting_changes": false,
"git_clone_url": "https://github.com/Pylons/pyramid.git",
"long_checkout": false,
"py_versions": ["all"]
Expand Down Expand Up @@ -112,7 +112,7 @@
},
"virtualenv": {
"cli_arguments": [],
"expect_formatting_changes": true,
"expect_formatting_changes": false,
"git_clone_url": "https://github.com/pypa/virtualenv.git",
"long_checkout": false,
"py_versions": ["all"]
Expand Down
2 changes: 1 addition & 1 deletion src/blib2to3/pytree.py
Expand Up @@ -33,7 +33,7 @@
import sys
from io import StringIO

HUGE: int = 0x7fffffff # maximum repeat count, default max
HUGE: int = 0x7FFFFFFF # maximum repeat count, default max

_type_reprs: Dict[int, Union[Text, int]] = {}

Expand Down
4 changes: 2 additions & 2 deletions tests/data/numeric_literals.py
Expand Up @@ -12,7 +12,7 @@
x = 123456789E123456789
x = 123456789J
x = 123456789.123456789J
x = 0Xb1aCc
x = 0XB1ACC
x = 0B1011
x = 0O777
x = 0.000000006
Expand All @@ -36,7 +36,7 @@
x = 123456789e123456789
x = 123456789j
x = 123456789.123456789j
x = 0xb1acc
x = 0xB1ACC
x = 0b1011
x = 0o777
x = 0.000000006
Expand Down
4 changes: 2 additions & 2 deletions tests/data/numeric_literals_py2.py
Expand Up @@ -3,7 +3,7 @@
x = 123456789L
x = 123456789l
x = 123456789
x = 0xB1aCc
x = 0xb1acc

# output

Expand All @@ -13,4 +13,4 @@
x = 123456789L
x = 123456789L
x = 123456789
x = 0xb1acc
x = 0xB1ACC
6 changes: 3 additions & 3 deletions tests/data/numeric_literals_skip_underscores.py
Expand Up @@ -3,7 +3,7 @@
x = 123456789
x = 1_2_3_4_5_6_7
x = 1E+1
x = 0xb1AcC
x = 0xb1acc
x = 0.00_00_006
x = 12_34_567J
x = .1_2
Expand All @@ -16,8 +16,8 @@
x = 123456789
x = 1_2_3_4_5_6_7
x = 1e1
x = 0xb1acc
x = 0xB1ACC
x = 0.00_00_006
x = 12_34_567j
x = 0.1_2
x = 1_2.0
x = 1_2.0

0 comments on commit 773e4a2

Please sign in to comment.