Merge branch '3.x' into 7774_remove_develop.rst

1 files changed, 14 insertions, 10 deletions

diff --git a/sphinx/io.py b/sphinx/io.py
index f45d5bf5d..3508dd58d 100644
--- a/sphinx/io.py
+++ b/sphinx/io.py
@@ -4,7 +4,7 @@
 
     Input/Output files
 
-    :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import codecs
@@ -22,24 +22,23 @@ from docutils.transforms import Transform
 from docutils.transforms.references import DanglingReferences
 from docutils.writers import UnfilteredWriter
 
+from sphinx import addnodes
 from sphinx.deprecation import RemovedInSphinx40Warning, deprecated_alias
 from sphinx.environment import BuildEnvironment
 from sphinx.errors import FiletypeNotFoundError
-from sphinx.transforms import (
-    AutoIndexUpgrader, DoctreeReadEvent, FigureAligner, SphinxTransformer
-)
-from sphinx.transforms.i18n import (
-    PreserveTranslatableMessages, Locale, RemoveTranslatableInline,
-)
+from sphinx.transforms import (AutoIndexUpgrader, DoctreeReadEvent, FigureAligner,
+                               SphinxTransformer)
+from sphinx.transforms.i18n import (Locale, PreserveTranslatableMessages,
+                                    RemoveTranslatableInline)
 from sphinx.transforms.references import SphinxDomains
-from sphinx.util import logging, get_filetype
-from sphinx.util import UnicodeDecodeErrorHandler
+from sphinx.util import UnicodeDecodeErrorHandler, get_filetype, logging
 from sphinx.util.docutils import LoggingReporter
 from sphinx.versioning import UIDTransform
 
 if False:
     # For type annotation
     from typing import Type  # for python3.5.1
+
     from sphinx.application import Sphinx
 
 
@@ -96,6 +95,7 @@ class SphinxBaseReader(standalone.Reader):
         for logging.
         """
         document = super().new_document()
+        document.__class__ = addnodes.document  # replace the class with patched version
 
         # substitute transformer
         document.transformer = SphinxTransformer(document)
@@ -227,4 +227,8 @@ deprecated_alias('sphinx.io',
                      'FiletypeNotFoundError': FiletypeNotFoundError,
                      'get_filetype': get_filetype,
                  },
-                 RemovedInSphinx40Warning)
+                 RemovedInSphinx40Warning,
+                 {
+                     'FiletypeNotFoundError': 'sphinx.errors.FiletypeNotFoundError',
+                     'get_filetype': 'sphinx.util.get_filetype',
+                 })