Skip to content

Commit

Permalink
functools: Give up on lazy-importing types (python#124736)
Browse files Browse the repository at this point in the history
PR python#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.
  • Loading branch information
JelleZijlstra authored Sep 29, 2024
1 parent 76fbee6 commit 95581b3
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions Lib/functools.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@

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
################################################################################
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -931,7 +928,7 @@ def dispatch(cls):

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):
Expand Down Expand Up @@ -1008,7 +1005,7 @@ def wrapper(*args, **kw):
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
Expand Down

0 comments on commit 95581b3

Please sign in to comment.