99import sphinx
1010from sphinx .testing .util import SphinxTestApp
1111
12- sphinx_version = parse (version ("sphinx" ))
13- if sphinx_version .major < 7 :
14- from sphinx .testing .path import path as sphinx_path
15- else :
16- from pathlib import Path as sphinx_path
17-
1812
13+ sphinx_version = parse (version ("sphinx" ))
1914path_tests = Path (__file__ ).parent
2015
2116
@@ -56,7 +51,7 @@ def html_tree(self, *path):
5651def sphinx_build_factory (make_app , tmp_path ):
5752 def _func (src_folder , ** kwargs ):
5853 copytree (path_tests / "sites" / src_folder , tmp_path / src_folder )
59- app = make_app (srcdir = sphinx_path (tmp_path / src_folder ), ** kwargs )
54+ app = make_app (srcdir = Path (tmp_path / src_folder ), ** kwargs )
6055 return SphinxBuild (app , tmp_path / src_folder )
6156
6257 yield _func
@@ -469,7 +464,7 @@ def test_sidenote(sphinx_build_factory, file_regression):
469464 page2 = sphinx_build .html_tree ("page2.html" )
470465
471466 sidenote_html = page2 .select ("section > #sidenotes" )
472- regression_file = "test_sidenote_6" if sphinx_version . major < 7 else " test_sidenote"
467+ regression_file = "test_sidenote"
473468 file_regression .check (
474469 sidenote_html [0 ].prettify (),
475470 extension = ".html" ,
@@ -487,9 +482,8 @@ def test_marginnote(sphinx_build_factory, file_regression):
487482 page2 = sphinx_build .html_tree ("page2.html" )
488483
489484 marginnote_html = page2 .select ("section > #marginnotes" )
490- regression_file = (
491- "test_marginnote_6" if sphinx_version .major < 7 else "test_marginnote"
492- )
485+ regression_file = "test_marginnote"
486+
493487 file_regression .check (
494488 marginnote_html [0 ].prettify (),
495489 extension = ".html" ,
0 commit comments