diff --git a/docs/conf.py b/docs/conf.py index a7b379e36..be42b87aa 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -230,5 +230,5 @@ extlinks = {"dpy_docs": (f"https://discordpy.readthedocs.io/en/v{dpy_version}/%s doctest_test_doctest_blocks = "" # Autodoc options -autodoc_default_flags = ["show-inheritance"] +autodoc_default_options = {"show-inheritance": True} autodoc_typehints = "none" diff --git a/redbot/core/config.py b/redbot/core/config.py index dcb6cde54..bd2f1da39 100644 --- a/redbot/core/config.py +++ b/redbot/core/config.py @@ -1,5 +1,5 @@ import asyncio -import collections +import collections.abc import logging import pickle import weakref @@ -510,7 +510,7 @@ class Group(Value): return self(acquire_lock=acquire_lock) def nested_update( - self, current: collections.Mapping, defaults: Dict[str, Any] = ... + self, current: collections.abc.Mapping, defaults: Dict[str, Any] = ... ) -> Dict[str, Any]: """Robust updater for nested dictionaries @@ -521,7 +521,7 @@ class Group(Value): defaults = self.defaults for key, value in current.items(): - if isinstance(value, collections.Mapping): + if isinstance(value, collections.abc.Mapping): result = self.nested_update(value, defaults.get(key, {})) defaults[key] = result else: diff --git a/redbot/core/events.py b/redbot/core/events.py index c36874a6c..ee40022ac 100644 --- a/redbot/core/events.py +++ b/redbot/core/events.py @@ -22,7 +22,7 @@ from .utils.chat_formatting import inline, bordered, format_perms_list, humanize log = logging.getLogger("red") init() -INTRO = """ +INTRO = r""" ______ _ ______ _ _ ______ _ | ___ \ | | | _ (_) | | | ___ \ | | | |_/ /___ __| | ______ | | | |_ ___ ___ ___ _ __ __| | | |_/ / ___ | |_