[commands module] functools.partial support

redbot/core/commands/commands.py

@@ -7,21 +7,18 @@
 
 import inspect
 import re
+import functools
 import weakref
 from typing import (
     Awaitable,
     Callable,
-    Coroutine,
-    TypeVar,
-    Type,
     Dict,
     List,
     Optional,
     Tuple,
     Union,
     MutableMapping,
     TYPE_CHECKING,
-    cast,
 )
 
 import discord
@@ -38,7 +35,6 @@
     Greedy,
 )
 
-from . import converter as converters
 from .errors import ConversionFailure
 from .requires import PermState, PrivilegeLevel, Requires, PermStateAllowedStates
 from ..i18n import Translator
@@ -307,11 +303,19 @@ def callback(self):
     def callback(self, function):
         """
         Below should be mostly the same as discord.py
-        The only (current) change is to filter out typing.Optional
-        if a user has specified the desire for this behavior
+
+        Currently, we modify behavior for
+
+          - functools.partial support
+          - typing.Optional behavior change as an option
         """
         self._callback = function
-        self.module = function.__module__
+        if isinstance(function, functools.partial):
+            self.module = function.func.__module__
+            globals_ = function.func.__globals__
+        else:
+            self.module = function.__module__
+            globals_ = function.__globals__
 
         signature = inspect.signature(function)
         self.params = signature.parameters.copy()
@@ -322,7 +326,7 @@ def callback(self, function):
         for key, value in self.params.items():
             if isinstance(value.annotation, str):
                 self.params[key] = value = value.replace(
-                    annotation=eval(value.annotation, function.__globals__)
+                    annotation=eval(value.annotation, globals_)
                 )
 
             # fail early for when someone passes an unparameterized Greedy type