Remove deprecated features marked as RemovedInSphinx40Warning

2 files changed, 2 insertions, 15 deletions

diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py
index a864e19d1..0b20e6990 100644
--- a/sphinx/testing/fixtures.py
+++ b/sphinx/testing/fixtures.py
@@ -8,7 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-import os
 import subprocess
 import sys
 from collections import namedtuple
@@ -221,10 +220,7 @@ def sphinx_test_tempdir(tmpdir_factory: Any) -> "util.path":
     """
     temporary directory that wrapped with `path` class.
     """
-    tmpdir = os.environ.get('SPHINX_TEST_TEMPDIR')  # RemovedInSphinx40Warning
-    if tmpdir is None:
-        tmpdir = tmpdir_factory.getbasetemp()
-
+    tmpdir = tmpdir_factory.getbasetemp()
     return util.path(tmpdir).abspath()
 
 
diff --git a/sphinx/testing/util.py b/sphinx/testing/util.py
index 450241f55..6c0e22139 100644
--- a/sphinx/testing/util.py
+++ b/sphinx/testing/util.py
@@ -21,16 +21,13 @@ from docutils.parsers.rst import directives, roles
 
 from sphinx import application, locale
 from sphinx.builders.latex import LaTeXBuilder
-from sphinx.deprecation import RemovedInSphinx40Warning
 from sphinx.pycode import ModuleAnalyzer
 from sphinx.testing.path import path
 from sphinx.util.osutil import relpath
 
 
 __all__ = [
-    'Struct',
-    'SphinxTestApp', 'SphinxTestAppWrapperForSkipBuilding',
-    'remove_unicode_literals',
+    'Struct', 'SphinxTestApp', 'SphinxTestAppWrapperForSkipBuilding',
 ]
 
 
@@ -179,12 +176,6 @@ class SphinxTestAppWrapperForSkipBuilding:
 _unicode_literals_re = re.compile(r'u(".*?")|u(\'.*?\')')
 
 
-def remove_unicode_literals(s: str) -> str:
-    warnings.warn('remove_unicode_literals() is deprecated.',
-                  RemovedInSphinx40Warning, stacklevel=2)
-    return _unicode_literals_re.sub(lambda x: x.group(1) or x.group(2), s)
-
-
 def find_files(root: str, suffix: bool = None) -> Generator[str, None, None]:
     for dirpath, dirs, files in os.walk(root, followlinks=True):
         dirpath = path(dirpath)