Merge branch 'u/soehms/join_feature_texfile_with_pdflatex_34282' of t…

…rac.sagemath.org:sage into hide_features_34185

src/sage/features/latex.py

@@ -13,7 +13,6 @@
 # ****************************************************************************
 
 from . import StaticFile, Executable, FeatureTestResult, FeatureNotPresentError
-from sage.features.join_feature import JoinFeature
 
 latex_url = 'https://www.latex-project.org/'
 latex_spkg = 'texlive'
@@ -37,7 +36,7 @@ def __init__(self, name):
             sage: isinstance(latex(), latex)
             True
         """
-        Executable.__init__(self, name, executable=name, spkg=latex_spkg, url=latex_url)
+        super().__init__(name, executable=name, spkg=latex_spkg, url=latex_url)
 
     def is_functional(self):
         r"""
@@ -97,7 +96,7 @@ def __init__(self):
             sage: isinstance(latex(), latex)
             True
         """
-        LaTeX.__init__(self, "latex")
+        super().__init__("latex")
 
 
 class pdflatex(LaTeX):
@@ -118,7 +117,7 @@ def __init__(self):
             sage: isinstance(pdflatex(), pdflatex)
             True
         """
-        LaTeX.__init__(self, "pdflatex")
+        super().__init__("pdflatex")
 
 
 class xelatex(LaTeX):
@@ -139,7 +138,7 @@ def __init__(self):
             sage: isinstance(xelatex(), xelatex)
             True
         """
-        LaTeX.__init__(self, "xelatex")
+        super().__init__("xelatex")
 
 
 class lualatex(LaTeX):
@@ -160,10 +159,10 @@ def __init__(self):
             sage: isinstance(lualatex(), lualatex)
             True
         """
-        LaTeX.__init__(self, "lualatex")
+        super().__init__("lualatex")
 
 
-class TeXFile(StaticFile, JoinFeature):
+class TeXFile(StaticFile):
     r"""
     A :class:`sage.features.Feature` describing the presence of a TeX file
 
@@ -175,14 +174,14 @@ class TeXFile(StaticFile, JoinFeature):
     """
     def __init__(self, name, filename, **kwds):
         r"""
-        EXAMPLES::
+        Initialize.
+
+        TESTS::
 
-            sage: from sage.features.latex import LaTeXPackage, pdflatex
-            sage: LaTeXPackage("tkz-graph")._features
-            [Feature('pdflatex')]
+            sage: from sage.features.latex import TeXFile
+            sage: TeXFile('nonexisting', 'xxxxxx-nonexisting-file.tex').is_present()  # optional - latex
+            FeatureTestResult('nonexisting', False)
         """
-        JoinFeature.__init__(self, name, [pdflatex()],
-                             spkg=latex_spkg, url=latex_url)  # see :trac:`34282`
         StaticFile.__init__(self, name, filename, search_path=[], **kwds)
 
     def absolute_filename(self) -> str:
@@ -220,23 +219,6 @@ def _is_present(self):
         """
         return latex().is_present() and super()._is_present()
 
-    def _is_present(self):
-        r"""
-        Test for the presence of the TeX-file.
-
-        EXAMPLES::
-
-            sage: from sage.features.latex import LaTeXPackage, pdflatex
-            sage: f = LaTeXPackage("tkz-graph")
-            sage: g = pdflatex()
-            sage: bool(f.is_present()) == bool(g.is_present())  # indirect doctest
-            True
-        """
-        test = JoinFeature._is_present(self)
-        if not test:
-            return test
-        return super(TeXFile, self)._is_present()
-
 
 class LaTeXPackage(TeXFile):
     r"""