Skip to content

Commit 9be2a80

Browse files
committed
Rename to try_simple_decimal()
1 parent ed127fa commit 9be2a80

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

Lib/test/test_tomllib/test_misc.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -128,37 +128,37 @@ def test_types_import(self):
128128
"""
129129
importlib.import_module(f"{tomllib.__name__}._types")
130130

131-
def test_parse_simple_number(self):
132-
parse_simple_number = tomllib._parser.parse_simple_number
133-
self.assertEqual(parse_simple_number("123", 0), (3, 123))
134-
self.assertEqual(parse_simple_number("123\n", 0), (3, 123))
135-
self.assertEqual(parse_simple_number("123 456", 0), (3, 123))
136-
self.assertEqual(parse_simple_number("+123\n", 0), (4, 123))
137-
self.assertEqual(parse_simple_number("-123\n", 0), (4, -123))
138-
self.assertEqual(parse_simple_number("0\n", 0), (1, 0))
139-
self.assertEqual(parse_simple_number("+0\n", 0), (2, 0))
140-
self.assertEqual(parse_simple_number("-0\n", 0), (2, 0))
141-
self.assertEqual(parse_simple_number("[23]\n", 1), (3, 23))
142-
self.assertEqual(parse_simple_number("[23, 24]\n", 1), (3, 23))
143-
self.assertEqual(parse_simple_number("{x = 42}\n", 5), (7, 42))
144-
145-
self.assertIsNone(parse_simple_number("+", 0), None)
146-
self.assertIsNone(parse_simple_number("-", 0), None)
147-
self.assertIsNone(parse_simple_number("+\n", 0), None)
148-
self.assertIsNone(parse_simple_number("-\n", 0), None)
149-
self.assertIsNone(parse_simple_number("+inf\n", 0), None)
150-
self.assertIsNone(parse_simple_number("-nan\n", 0), None)
151-
self.assertIsNone(parse_simple_number("0123\n", 0))
152-
self.assertIsNone(parse_simple_number("1979-05-27\n", 0))
153-
self.assertIsNone(parse_simple_number("12:32:00\n", 0))
154-
self.assertIsNone(parse_simple_number("1.0\n", 0))
155-
self.assertIsNone(parse_simple_number("1_000\n", 0))
156-
self.assertIsNone(parse_simple_number("0x123\n", 0))
157-
self.assertIsNone(parse_simple_number("0o123\n", 0))
158-
self.assertIsNone(parse_simple_number("0b100\n", 0))
131+
def test_try_simple_decimal(self):
132+
try_simple_decimal = tomllib._parser.try_simple_decimal
133+
self.assertEqual(try_simple_decimal("123", 0), (3, 123))
134+
self.assertEqual(try_simple_decimal("123\n", 0), (3, 123))
135+
self.assertEqual(try_simple_decimal("123 456", 0), (3, 123))
136+
self.assertEqual(try_simple_decimal("+123\n", 0), (4, 123))
137+
self.assertEqual(try_simple_decimal("-123\n", 0), (4, -123))
138+
self.assertEqual(try_simple_decimal("0\n", 0), (1, 0))
139+
self.assertEqual(try_simple_decimal("+0\n", 0), (2, 0))
140+
self.assertEqual(try_simple_decimal("-0\n", 0), (2, 0))
141+
self.assertEqual(try_simple_decimal("[23]\n", 1), (3, 23))
142+
self.assertEqual(try_simple_decimal("[23, 24]\n", 1), (3, 23))
143+
self.assertEqual(try_simple_decimal("{x = 42}\n", 5), (7, 42))
144+
145+
self.assertIsNone(try_simple_decimal("+", 0), None)
146+
self.assertIsNone(try_simple_decimal("-", 0), None)
147+
self.assertIsNone(try_simple_decimal("+\n", 0), None)
148+
self.assertIsNone(try_simple_decimal("-\n", 0), None)
149+
self.assertIsNone(try_simple_decimal("+inf\n", 0), None)
150+
self.assertIsNone(try_simple_decimal("-nan\n", 0), None)
151+
self.assertIsNone(try_simple_decimal("0123\n", 0))
152+
self.assertIsNone(try_simple_decimal("1979-05-27\n", 0))
153+
self.assertIsNone(try_simple_decimal("12:32:00\n", 0))
154+
self.assertIsNone(try_simple_decimal("1.0\n", 0))
155+
self.assertIsNone(try_simple_decimal("1_000\n", 0))
156+
self.assertIsNone(try_simple_decimal("0x123\n", 0))
157+
self.assertIsNone(try_simple_decimal("0o123\n", 0))
158+
self.assertIsNone(try_simple_decimal("0b100\n", 0))
159159

160160
def test_lazy_import(self):
161-
# Test that parse_simple_number() can parse the TOML file without
161+
# Test that try_simple_decimal() can parse the TOML file without
162162
# importing regular expressions (tomllib._re)
163163
filename = os_helper.TESTFN
164164
self.addCleanup(os_helper.unlink, filename)

Lib/tomllib/_parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ def parse_basic_str(src: str, pos: Pos, *, multiline: bool) -> tuple[Pos, str]:
669669

670670

671671
# Sub-set of RE_NUMBER: only support decimal integer without "_" separator
672-
def parse_simple_number(
672+
def try_simple_decimal(
673673
src: str, pos: Pos
674674
) -> None | tuple[Pos, int]:
675675
start = pos
@@ -739,7 +739,7 @@ def parse_value(
739739
# First try a simple number parser which defers import tomllib._re
740740
# to speed up tomllib import time
741741
if char in NUMBER_INITIAL_CHARS:
742-
res = parse_simple_number(src, pos)
742+
res = try_simple_decimal(src, pos)
743743
if res is not None:
744744
return res
745745

0 commit comments

Comments
 (0)