Merging upstream version 7.4.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 12 insertions, 12 deletions

diff --git a/tests/test_markup/test_markup.py b/tests/test_markup/test_markup.py
index c933481..a23219c 100644
--- a/tests/test_markup/test_markup.py
+++ b/tests/test_markup/test_markup.py
@@ -21,7 +21,7 @@ from sphinx.writers.html import HTML5Translator, HTMLWriter
 from sphinx.writers.latex import LaTeXTranslator, LaTeXWriter
 
 
-@pytest.fixture()
+@pytest.fixture
 def settings(app):
     texescape.init()  # otherwise done by the latex builder
     with warnings.catch_warnings():
@@ -42,7 +42,7 @@ def settings(app):
     domain_context.disable()
 
 
-@pytest.fixture()
+@pytest.fixture
 def new_document(settings):
     def create():
         document = utils.new_document('test data', settings)
@@ -52,14 +52,14 @@ def new_document(settings):
     return create
 
 
-@pytest.fixture()
+@pytest.fixture
 def inliner(new_document):
     document = new_document()
     document.reporter.get_source_and_line = lambda line=1: ('dummy.rst', line)
     return SimpleNamespace(document=document, reporter=document.reporter)
 
 
-@pytest.fixture()
+@pytest.fixture
 def parse(new_document):
     def parse_(rst):
         document = new_document()
@@ -90,7 +90,7 @@ class ForgivingLaTeXTranslator(LaTeXTranslator, ForgivingTranslator):
     pass
 
 
-@pytest.fixture()
+@pytest.fixture
 def verify_re_html(app, parse):
     def verify(rst, html_expected):
         document = parse(rst)
@@ -102,7 +102,7 @@ def verify_re_html(app, parse):
     return verify
 
 
-@pytest.fixture()
+@pytest.fixture
 def verify_re_latex(app, parse):
     def verify(rst, latex_expected):
         document = parse(rst)
@@ -117,7 +117,7 @@ def verify_re_latex(app, parse):
     return verify
 
 
-@pytest.fixture()
+@pytest.fixture
 def verify_re(verify_re_html, verify_re_latex):
     def verify_re_(rst, html_expected, latex_expected):
         if html_expected:
@@ -127,7 +127,7 @@ def verify_re(verify_re_html, verify_re_latex):
     return verify_re_
 
 
-@pytest.fixture()
+@pytest.fixture
 def verify(verify_re_html, verify_re_latex):
     def verify_(rst, html_expected, latex_expected):
         if html_expected:
@@ -137,7 +137,7 @@ def verify(verify_re_html, verify_re_latex):
     return verify_
 
 
-@pytest.fixture()
+@pytest.fixture
 def get_verifier(verify, verify_re):
     v = {
         'verify': verify,
diff --git a/tests/test_markup/test_smartquotes.py b/tests/test_markup/test_smartquotes.py
index 6c84386..b35f05f 100644
--- a/tests/test_markup/test_smartquotes.py
+++ b/tests/test_markup/test_smartquotes.py
@@ -41,7 +41,7 @@ def test_text_builder(app, status, warning):
 def test_man_builder(app, status, warning):
     app.build()
 
-    content = (app.outdir / 'python.1').read_text(encoding='utf8')
+    content = (app.outdir / 'projectnamenotset.1').read_text(encoding='utf8')
     assert r'\-\- \(dqSphinx\(dq is a tool that makes it easy ...' in content
 
 
@@ -49,7 +49,7 @@ def test_man_builder(app, status, warning):
 def test_latex_builder(app, status, warning):
     app.build()
 
-    content = (app.outdir / 'python.tex').read_text(encoding='utf8')
+    content = (app.outdir / 'projectnamenotset.tex').read_text(encoding='utf8')
     assert '\\textendash{} “Sphinx” is a tool that makes it easy …' in content
 
 
@@ -94,5 +94,5 @@ def test_smartquotes_excludes_language(app, status, warning):
 def test_smartquotes_excludes_builders(app, status, warning):
     app.build()
 
-    content = (app.outdir / 'python.1').read_text(encoding='utf8')
+    content = (app.outdir / 'projectnamenotset.1').read_text(encoding='utf8')
     assert '– “Sphinx” is a tool that makes it easy …' in content