gh-142349: Move all lazy-imports-by-hand to use the new lazy keyword

Author: pablogsal

Lib/_aix_support.py

@@ -1,5 +1,8 @@
 """Shared AIX support functions."""
 
+lazy import os
+lazy import contextlib
+
 import sys
 import sysconfig
 
@@ -10,8 +13,6 @@ def _read_cmd_output(commandstring, capture_stderr=False):
     # Similar to os.popen(commandstring, "r").read(),
     # but without actually using os.popen because that
     # function is not usable during python bootstrap.
-    import os
-    import contextlib
     fp = open("/tmp/_aix_support.%s"%(
         os.getpid(),), "w+b")
 

Lib/_collections_abc.py

@@ -32,6 +32,9 @@
 #
 #######################################################################
 
+lazy from annotationlib import type_repr
+lazy import warnings
+
 from abc import ABCMeta, abstractmethod
 import sys
 
@@ -485,7 +488,6 @@ def __new__(cls, origin, args):
     def __repr__(self):
         if len(self.__args__) == 2 and _is_param_expr(self.__args__[0]):
             return super().__repr__()
-        from annotationlib import type_repr
         return (f'collections.abc.Callable'
                 f'[[{", ".join([type_repr(a) for a in self.__args__[:-1]])}], '
                 f'{type_repr(self.__args__[-1])}]')
@@ -1064,7 +1066,6 @@ def count(self, value):
 class _DeprecateByteStringMeta(ABCMeta):
     def __new__(cls, name, bases, namespace, **kwargs):
         if name != "ByteString":
-            import warnings
 
             warnings._deprecated(
                 "collections.abc.ByteString",
@@ -1073,7 +1074,6 @@ def __new__(cls, name, bases, namespace, **kwargs):
         return super().__new__(cls, name, bases, namespace, **kwargs)
 
     def __instancecheck__(cls, instance):
-        import warnings
 
         warnings._deprecated(
             "collections.abc.ByteString",
@@ -1170,7 +1170,6 @@ def __iadd__(self, values):
 
 def __getattr__(attr):
     if attr == "ByteString":
-        import warnings
         warnings._deprecated("collections.abc.ByteString", remove=(3, 17))
         globals()["ByteString"] = _deprecated_ByteString
         return _deprecated_ByteString

Lib/_osx_support.py

@@ -1,5 +1,7 @@
 """Shared OS X support functions."""
 
+lazy import contextlib
+
 import os
 import re
 import sys
@@ -58,7 +60,6 @@ def _read_output(commandstring, capture_stderr=False):
     # but without actually using os.popen because that
     # function is not usable during python bootstrap.
     # tempfile is also not available then.
-    import contextlib
     try:
         import tempfile
         fp = tempfile.NamedTemporaryFile()

Lib/_pydatetime.py

@@ -1,5 +1,8 @@
 """Pure Python implementation of the datetime module."""
 
+lazy import _strptime
+lazy import warnings
+
 __all__ = ("date", "datetime", "time", "timedelta", "timezone", "tzinfo",
            "MINYEAR", "MAXYEAR", "UTC")
 
@@ -1077,7 +1080,6 @@ def strptime(cls, date_string, format):
         For a list of supported format codes, see the documentation:
             https://docs.python.org/3/library/datetime.html#format-codes
         """
-        import _strptime
         return _strptime._strptime_datetime_date(cls, date_string, format)
 
     # Conversions to string
@@ -1469,7 +1471,6 @@ def strptime(cls, date_string, format):
         For a list of supported format codes, see the documentation:
             https://docs.python.org/3/library/datetime.html#format-codes
         """
-        import _strptime
         return _strptime._strptime_datetime_time(cls, date_string, format)
 
     # Read-only field accessors
@@ -1908,7 +1909,6 @@ def fromtimestamp(cls, timestamp, tz=None):
     @classmethod
     def utcfromtimestamp(cls, t):
         """Construct a naive UTC datetime from a POSIX timestamp."""
-        import warnings
         warnings.warn("datetime.datetime.utcfromtimestamp() is deprecated and scheduled "
                       "for removal in a future version. Use timezone-aware "
                       "objects to represent datetimes in UTC: "
@@ -1926,7 +1926,6 @@ def now(cls, tz=None):
     @classmethod
     def utcnow(cls):
         "Construct a UTC datetime from time.time()."
-        import warnings
         warnings.warn("datetime.datetime.utcnow() is deprecated and scheduled for "
                       "removal in a future version. Use timezone-aware "
                       "objects to represent datetimes in UTC: "
@@ -2217,7 +2216,6 @@ def strptime(cls, date_string, format):
         For a list of supported format codes, see the documentation:
             https://docs.python.org/3/library/datetime.html#format-codes
         """
-        import _strptime
         return _strptime._strptime_datetime_datetime(cls, date_string, format)
 
     def utcoffset(self):

Lib/_pydecimal.py

@@ -15,6 +15,9 @@
 
 """Python decimal arithmetic module"""
 
+lazy from itertools import chain as _chain, repeat as _repeat
+lazy from warnings import _deprecated as _warnings_deprecated
+
 __all__ = [
     # Two major classes
     'Decimal', 'Context',
@@ -6279,11 +6282,10 @@ def _group_lengths(grouping):
     #   (2) nonempty list of positive integers + [0]
     #   (3) list of positive integers + [locale.CHAR_MAX], or
 
-    from itertools import chain, repeat
     if not grouping:
         return []
     elif grouping[-1] == 0 and len(grouping) >= 2:
-        return chain(grouping[:-1], repeat(grouping[-2]))
+        return _chain(grouping[:-1], _repeat(grouping[-2]))
     elif grouping[-1] == _locale.CHAR_MAX:
         return grouping[:-1]
     else:
@@ -6405,8 +6407,7 @@ def _format_number(is_negative, intpart, fracpart, exp, spec):
 
 def __getattr__(name):
     if name == "__version__":
-        from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 20))
+        _warnings_deprecated("__version__", remove=(3, 20))
         return SPEC_VERSION
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

Lib/_pyio.py

@@ -2,6 +2,8 @@
 Python implementation of the io module.
 """
 
+lazy import warnings
+
 import os
 import abc
 import codecs
@@ -59,7 +61,6 @@ def text_encoding(encoding, stacklevel=2):
         else:
             encoding = "locale"
         if sys.flags.warn_default_encoding:
-            import warnings
             warnings.warn("'encoding' argument not specified.",
                           EncodingWarning, stacklevel + 1)
     return encoding
@@ -225,7 +226,6 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None,
     if binary and newline is not None:
         raise ValueError("binary mode doesn't take a newline argument")
     if binary and buffering == 1:
-        import warnings
         warnings.warn("line buffering (buffering=1) isn't supported in binary "
                       "mode, the default buffer size will be used",
                       RuntimeWarning, 2)
@@ -283,7 +283,6 @@ def _open_code_with_warning(path):
     in order to allow embedders more control over code files.
     This functionality is not supported on the current runtime.
     """
-    import warnings
     warnings.warn("_pyio.open_code() may not be using hooks",
                   RuntimeWarning, 2)
     return open(path, "rb")
@@ -1530,7 +1529,6 @@ def __init__(self, file, mode='r', closefd=True, opener=None):
             raise TypeError('integer argument expected, got float')
         if isinstance(file, int):
             if isinstance(file, bool):
-                import warnings
                 warnings.warn("bool is used as a file descriptor",
                               RuntimeWarning, stacklevel=2)
                 file = int(file)
@@ -1633,7 +1631,6 @@ def __init__(self, file, mode='r', closefd=True, opener=None):
 
     def _dealloc_warn(self, source):
         if self._fd >= 0 and self._closefd and not self.closed:
-            import warnings
             warnings.warn(f'unclosed file {source!r}', ResourceWarning,
                           stacklevel=2, source=self)
 

Lib/_pylong.py

@@ -12,6 +12,8 @@
 tricky or non-obvious code is not worth it.  For people looking for
 maximum performance, they should use something like gmpy2."""
 
+lazy from decimal import Decimal as D
+
 import re
 import decimal
 try:
@@ -149,7 +151,6 @@ def int_to_decimal(n):
     # "clever" recursive way.  If we want a string representation, we
     # apply str to _that_.
 
-    from decimal import Decimal as D
     BITLIM = 200
 
     # Don't bother caching the "lo" mask in this; the time to compute it is

Lib/_pyrepl/_threading_handler.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+lazy import threading
+
 from dataclasses import dataclass, field
 import traceback
 
@@ -28,7 +30,6 @@ def add(self, s: str) -> None: ...
 
 
 def install_threading_hook(reader: Reader) -> None:
-    import threading
 
     @dataclass
     class ExceptHookHandler:

Lib/_pyrepl/commands.py

@@ -20,6 +20,11 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 from __future__ import annotations
+lazy import signal
+lazy import _sitebuiltins
+lazy from .pager import get_pager
+lazy from site import gethistoryfile
+
 import os
 import time
 
@@ -215,7 +220,6 @@ def do(self) -> None:
 
 class interrupt(FinishCommand):
     def do(self) -> None:
-        import signal
 
         self.reader.console.finish()
         self.reader.finish()
@@ -231,7 +235,6 @@ def do(self) -> None:
 
 class suspend(Command):
     def do(self) -> None:
-        import signal
 
         r = self.reader
         p = r.pos
@@ -446,7 +449,6 @@ def do(self) -> None:
 
 class help(Command):
     def do(self) -> None:
-        import _sitebuiltins
 
         with self.reader.suspend():
             self.reader.msg = _sitebuiltins._Helper()()  # type: ignore[assignment]
@@ -467,8 +469,6 @@ def do(self) -> None:
 
 class show_history(Command):
     def do(self) -> None:
-        from .pager import get_pager
-        from site import gethistoryfile
 
         history = os.linesep.join(self.reader.history[:])
         self.reader.console.restore()

Lib/_pyrepl/console.py

@@ -19,6 +19,8 @@
 
 from __future__ import annotations
 
+lazy import traceback
+
 import _colorize
 
 from abc import ABC, abstractmethod
@@ -170,7 +172,6 @@ def showsyntaxerror(self, filename=None, **kwargs):
         super().showsyntaxerror(filename=filename, **kwargs)
 
     def _excepthook(self, typ, value, tb):
-        import traceback
         lines = traceback.format_exception(
                 typ, value, tb,
                 colorize=self.can_colorize,