Always define, add underscores, always remove

sphinx/testing/util.py

@@ -112,11 +112,9 @@ def __init__(
         parallel: int = 0,
     ) -> None:
 
+        self.docutils_conf_path = srcdir / 'docutils.conf'
         if docutilsconf is not None:
-            self.docutilsconfpath = srcdir / 'docutils.conf'
-            self.docutilsconfpath.write_text(docutilsconf)
-        else:
-            self.docutilsconfpath = None
+            self.docutils_conf_path.write_text(docutilsconf)
 
         if builddir is None:
             builddir = srcdir / '_build'
@@ -157,8 +155,10 @@ def cleanup(self, doctrees: bool = False) -> None:
                method not in self._saved_nodeclasses:
                 delattr(nodes.GenericNodeVisitor, 'visit_' + method[6:])
                 delattr(nodes.GenericNodeVisitor, 'depart_' + method[6:])
-        if self.docutilsconfpath:
-            self.docutilsconfpath.unlink()
+        try:
+            os.remove(self.docutils_conf_path)
+        except FileNotFoundError:
+            pass
 
     def __repr__(self) -> str:
         return f'<{self.__class__.__name__} buildername={self.builder.name!r}>'