mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-05-17 11:19:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix descriptor detection in enum code.

Browse Source
This commit is contained in:
Rapptz 2019-06-09 08:11:23 -04:00
parent 7980213745
commit 855a6c5b59
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
discord/enums.py
View File

@ -25,7 +25,6 @@ DEALINGS IN THE SOFTWARE.
""" """
import types import types
import inspect
from collections import namedtuple from collections import namedtuple
__all__ = ( __all__ = (
@ -57,6 +56,9 @@ def _create_value_cls(name):
cls.__str__ = lambda self: '%s.%s' % (name, self.name) cls.__str__ = lambda self: '%s.%s' % (name, self.name)
return cls return cls
def _is_descriptor(obj):
return hasattr(obj, '__get__') or hasattr(obj, '__set__') or hasattr(obj, '__delete__')
class EnumMeta(type): class EnumMeta(type):
def __new__(cls, name, bases, attrs): def __new__(cls, name, bases, attrs):
value_mapping = {} value_mapping = {}
@ -65,18 +67,19 @@ class EnumMeta(type):
value_cls = _create_value_cls(name) value_cls = _create_value_cls(name)
for key, value in list(attrs.items()): for key, value in list(attrs.items()):
is_function = isinstance(value, types.FunctionType) is_descriptor = _is_descriptor(value)
if key[0] == '_' and not is_function: if key[0] == '_' and not is_descriptor:
continue continue
if is_function: # Special case classmethod to just pass through
if isinstance(value, classmethod):
continue
if is_descriptor:
setattr(value_cls, key, value) setattr(value_cls, key, value)
del attrs[key] del attrs[key]
continue continue
if inspect.ismethoddescriptor(value):
continue
try: try:
new_value = value_mapping[value] new_value = value_mapping[value]
except KeyError: except KeyError: