From 8a24ae200e8e3944e22c20ec7e16a7584c0474c9 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Mon, 23 Nov 2020 13:50:21 +0900
Subject: [PATCH] autodoc: Fix MRO of DataDocumenter and AttributeDocumenter

---
 sphinx/ext/autodoc/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
index 32616beb1..477de5921 100644
--- a/sphinx/ext/autodoc/__init__.py
+++ b/sphinx/ext/autodoc/__init__.py
@@ -1746,7 +1746,7 @@ class TypeVarMixin(DataDocumenterMixinBase):
         super().update_content(more_content)
 
 
-class DataDocumenter(ModuleLevelDocumenter, NewTypeMixin, TypeVarMixin):
+class DataDocumenter(NewTypeMixin, TypeVarMixin, ModuleLevelDocumenter):
     """
     Specialized Documenter subclass for data items.
     """
@@ -2071,7 +2071,8 @@ class SingledispatchMethodDocumenter(MethodDocumenter):
         super().__init__(*args, **kwargs)
 
 
-class AttributeDocumenter(DocstringStripSignatureMixin, ClassLevelDocumenter, NewTypeMixin, TypeVarMixin):  # type: ignore  # NOQA
+class AttributeDocumenter(NewTypeMixin, TypeVarMixin,  # type: ignore
+                          DocstringStripSignatureMixin, ClassLevelDocumenter):
     """
     Specialized Documenter subclass for attributes.
     """