Merge branch 'main' into 974-sphinx-8

# Conflicts:
#	breathe/project.py

breathe/apidoc.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     breathe.apidoc
     ~~~~~~~~~~~~~~
@@ -14,7 +13,6 @@
     :copyright: Originally by Sphinx Team, C++ modifications by Tatsuyuki Ishi
     :license: BSD, see LICENSE for details.
 """
-from __future__ import print_function
 
 import os
 import sys
@@ -24,14 +22,6 @@
 
 from breathe import __version__
 
-# Account for FileNotFoundError in Python 2
-# IOError is broader but will hopefully suffice
-try:
-    FileNotFoundError
-except NameError:
-    FileNotFoundError = IOError
-
-
 # Reference: Doxygen XSD schema file, CompoundKind only
 # Only what breathe supports are included
 # Translates identifier to English
@@ -71,7 +61,7 @@ def write_file(name, text, args):
                 if exc.errno != errno.EEXIST:
                     raise
         try:
-            with open(fname, "r") as target:
+            with open(fname) as target:
                 orig = target.read()
                 if orig == text:
                     print_info("File %s up to date, skipping." % fname, args)
@@ -141,7 +131,7 @@ def recurse_tree(args):
 
 class TypeAction(argparse.Action):
     def __init__(self, option_strings, dest, **kwargs):
-        super(TypeAction, self).__init__(option_strings, dest, **kwargs)
+        super().__init__(option_strings, dest, **kwargs)
         self.default = TYPEDICT.keys()
         self.metavar = ",".join(TYPEDICT.keys())
 

breathe/parser/compound.py

@@ -927,7 +927,7 @@ def __init__(self, char=None, valueOf_=''):
 # end class docCharTypeSub
 
 
-class verbatimTypeSub(object):
+class verbatimTypeSub:
     """
     New node type. Structure is largely pillaged from other nodes in order to
     match the set.
@@ -1200,7 +1200,7 @@ def parse(inFilename):
 
     try:
         doc = minidom.parse(inFilename)
-    except IOError as e:
+    except OSError as e:
         raise FileIOError(e)
     except ExpatError as e:
         raise ParseError(e)

breathe/parser/compoundsuper.py

@@ -134,7 +134,7 @@ def getName(self):
         return self.name
 
 
-class _MemberSpec(object):
+class _MemberSpec:
     def __init__(self, name='', data_type='', container=0):
         self.name = name
         self.data_type = data_type
@@ -2632,7 +2632,7 @@ def buildChildren(self, child_, nodeName_):
                 value_.append(text_.nodeValue)
             # We make this unicode so that our unicode renderer catch-all picks it up
             # otherwise it would go through as 'str' and we'd have to pick it up too
-            valuestr_ = u' '
+            valuestr_ = ' '
             obj_ = self.mixedclass_(MixedContainer.CategorySimple,
                 MixedContainer.TypeString, 'sp', valuestr_)
             self.content_.append(obj_)

breathe/parser/index.py

@@ -49,7 +49,7 @@ class FileIOError(Exception):
 def parse(inFilename):
     try:
         doc = minidom.parse(inFilename)
-    except IOError as e:
+    except OSError as e:
         raise FileIOError(e)
     except ExpatError as e:
         raise ParseError(e)

breathe/parser/indexsuper.py

@@ -129,7 +129,7 @@ def getName(self):
         return self.name
 
 
-class _MemberSpec(object):
+class _MemberSpec:
     def __init__(self, name='', data_type='', container=0):
         self.name = name
         self.data_type = data_type

tests/test_renderer.py

@@ -35,7 +35,7 @@ def app(test_params, app_params, make_app, shared_result):
     """
     args, kwargs = app_params
     assert "srcdir" in kwargs
-    kwargs["srcdir"].makedirs(exist_ok=True)
+    os.makedirs(kwargs["srcdir"], exist_ok=True)
     (kwargs["srcdir"] / "conf.py").write_text("")
     app_ = make_app(*args, **kwargs)
     yield app_

tests/warnings/source/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Test Breathe Warnings documentation build configuration file, created by
 # sphinx-quickstart on Thu Jun  5 18:57:21 2014.