functools: Give up on lazy-importing types (#124736)

PR #121089 added an eager import for types.MethodType, but
still left the existing hacks for lazily importing from types.

We could also create MethodType internally in functools.py (e.g.,
by using `type(Placeholder.__repr__)`, but it feels not worth it at
this point, so instead I unlazified all the usages of types in the
module.
This commit is contained in:
Jelle Zijlstra 2024-09-29 06:31:06 -07:00 committed by GitHub
parent 76fbee642e
commit 95581b3551
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 8 deletions

View File

@ -16,15 +16,12 @@ __all__ = ['update_wrapper', 'wraps', 'WRAPPER_ASSIGNMENTS', 'WRAPPER_UPDATES',
from abc import get_cache_token
from collections import namedtuple
# import types, weakref # Deferred to single_dispatch()
# import weakref # Deferred to single_dispatch()
from operator import itemgetter
from reprlib import recursive_repr
from types import MethodType
from types import GenericAlias, MethodType, MappingProxyType, UnionType
from _thread import RLock
# Avoid importing types, so we can speedup import time
GenericAlias = type(list[int])
################################################################################
### update_wrapper() and wraps() decorator
################################################################################
@ -900,7 +897,7 @@ def singledispatch(func):
# There are many programs that use functools without singledispatch, so we
# trade-off making singledispatch marginally slower for the benefit of
# making start-up of such applications slightly faster.
import types, weakref
import weakref
registry = {}
dispatch_cache = weakref.WeakKeyDictionary()
@ -931,7 +928,7 @@ def singledispatch(func):
def _is_union_type(cls):
from typing import get_origin, Union
return get_origin(cls) in {Union, types.UnionType}
return get_origin(cls) in {Union, UnionType}
def _is_valid_dispatch_type(cls):
if isinstance(cls, type):
@ -1008,7 +1005,7 @@ def singledispatch(func):
registry[object] = func
wrapper.register = register
wrapper.dispatch = dispatch
wrapper.registry = types.MappingProxyType(registry)
wrapper.registry = MappingProxyType(registry)
wrapper._clear_cache = dispatch_cache.clear
update_wrapper(wrapper, func)
return wrapper