Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Lib/test/test_tomllib/test_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
from pathlib import Path
import sys
import tempfile
import textwrap
import unittest
from test import support
from test.support.script_helper import assert_python_ok

from . import tomllib

Expand Down Expand Up @@ -124,3 +126,20 @@ def test_types_import(self):
never imported by tests.
"""
importlib.import_module(f"{tomllib.__name__}._types")

def test_lazy_import(self):
# Test the TOML file can be parsed without importing regular
# expressions (tomllib._re)
code = textwrap.dedent("""
import sys, tomllib, textwrap
document = textwrap.dedent('''
[metadata]
key = "text"
array = ["array", "of", "text"]
booleans = [true, false]
''')
tomllib.loads(document)
print("lazy import?", 'tomllib._re' not in sys.modules)
""")
proc = assert_python_ok("-c", code)
self.assertIn(b"lazy import? True", proc.out)
11 changes: 9 additions & 2 deletions Lib/tomllib/_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

from __future__ import annotations

from types import MappingProxyType
# Defer loading regular expressions until we actually need them in
# parse_value().
__lazy_modules__ = ["tomllib._re"]
Comment thread
encukou marked this conversation as resolved.

import sys

from ._re import (
Comment thread
vstinner marked this conversation as resolved.
RE_DATETIME,
Expand All @@ -15,6 +19,9 @@
match_to_number,
)

if sys.version_info < (3, 15):
from types import MappingProxyType as frozendict

TYPE_CHECKING = False
if TYPE_CHECKING:
from collections.abc import Iterable
Expand Down Expand Up @@ -42,7 +49,7 @@
KEY_INITIAL_CHARS: Final = BARE_KEY_CHARS | frozenset("\"'")
HEXDIGIT_CHARS: Final = frozenset("abcdef" "ABCDEF" "0123456789")

BASIC_STR_ESCAPE_REPLACEMENTS: Final = MappingProxyType(
BASIC_STR_ESCAPE_REPLACEMENTS: Final = frozendict(
{
"\\b": "\u0008", # backspace
"\\t": "\u0009", # tab
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Improve :mod:`tomllib` import time (up to 10x faster). Patch by Victor
Stinner.
Loading