Sphinx 7.4.0__py3-none-any.whl → 7.4.2__py3-none-any.whl

sphinx/__init__.py

@@ -1,6 +1,6 @@
 """The Sphinx documentation toolchain."""
 
-__version__ = '7.4.0'
+__version__ = '7.4.2'
 __display_version__ = __version__  # used for command line version
 
 # Keep this file executable as-is in Python 3!
@@ -27,7 +27,7 @@ warnings.filterwarnings(
 #:
 #: .. versionadded:: 1.2
 #:    Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (7, 4, 0, 'final', 0)
+version_info = (7, 4, 2, 'final', 0)
 
 package_dir = os.path.abspath(os.path.dirname(__file__))
 

sphinx/directives/patches.py

@@ -187,17 +187,17 @@ class Rubric(SphinxDirective):
     option_spec = {
         'class': directives.class_option,
         'name': directives.unchanged,
-        'level': lambda c: directives.choice(c, ('1', '2', '3', '4', '5', '6')),
+        'heading-level': lambda c: directives.choice(c, ('1', '2', '3', '4', '5', '6')),
     }
 
-    def run(self) -> list[Node]:
+    def run(self) -> list[nodes.rubric | nodes.system_message]:
         set_classes(self.options)
         rubric_text = self.arguments[0]
         textnodes, messages = self.parse_inline(rubric_text, lineno=self.lineno)
+        if 'heading-level' in self.options:
+            self.options['heading-level'] = int(self.options['heading-level'])
         rubric = nodes.rubric(rubric_text, '', *textnodes, **self.options)
         self.add_name(rubric)
-        if 'level' in self.options:
-            rubric['level'] = int(self.options['level'])
         return [rubric, *messages]
 
 

sphinx/environment/__init__.py

@@ -59,7 +59,7 @@ default_settings: dict[str, Any] = {
 
 # This is increased every time an environment attribute is added
 # or changed to properly invalidate pickle files.
-ENV_VERSION = 61
+ENV_VERSION = 62
 
 # config status
 CONFIG_UNSET = -1

sphinx/util/typing.py

@@ -212,7 +212,11 @@ def _is_unpack_form(obj: Any) -> bool:
 
 def _typing_internal_name(obj: Any) -> str | None:
     if sys.version_info[:2] >= (3, 10):
-        return obj.__name__
+        try:
+            return obj.__name__
+        except AttributeError:
+            # e.g. ParamSpecArgs, ParamSpecKwargs
+            return ''
     return getattr(obj, '_name', None)
 
 
@@ -237,7 +241,7 @@ def restify(cls: Any, mode: _RestifyMode = 'fully-qualified-except-typing') -> s
         raise ValueError(msg)
 
     # things that are not types
-    if cls in {None, NoneType}:
+    if cls is None or cls == NoneType:
         return ':py:obj:`None`'
     if cls is Ellipsis:
         return '...'
@@ -388,7 +392,7 @@ def stringify_annotation(
         raise ValueError(msg)
 
     # things that are not types
-    if annotation in {None, NoneType}:
+    if annotation is None or annotation == NoneType:
         return 'None'
     if annotation is Ellipsis:
         return '...'

sphinx/writers/html5.py

@@ -510,10 +510,10 @@ class HTML5Translator(SphinxTranslator, BaseTranslator):
         super().depart_title(node)
 
     # overwritten
-    def visit_rubric(self, node: Element) -> None:
-        if "level" in node:
-            level = node["level"]
-            if level in (1, 2, 3, 4, 5, 6):
+    def visit_rubric(self, node: nodes.rubric) -> None:
+        if 'heading-level' in node:
+            level = node['heading-level']
+            if level in {1, 2, 3, 4, 5, 6}:
                 self.body.append(self.starttag(node, f'h{level}', '', CLASS='rubric'))
             else:
                 logger.warning(
@@ -527,8 +527,8 @@ class HTML5Translator(SphinxTranslator, BaseTranslator):
             super().visit_rubric(node)
 
     # overwritten
-    def depart_rubric(self, node: Element) -> None:
-        if level := node.get("level"):
+    def depart_rubric(self, node: nodes.rubric) -> None:
+        if (level := node.get('heading-level')) in {1, 2, 3, 4, 5, 6}:
             self.body.append(f'</h{level}>\n')
         else:
             super().depart_rubric(node)

sphinx/writers/latex.py

@@ -972,12 +972,12 @@ class LaTeXTranslator(SphinxTranslator):
         self.body.append(r'\end{sphinxseealso}')
         self.body.append(BLANKLINE)
 
-    def visit_rubric(self, node: Element) -> None:
+    def visit_rubric(self, node: nodes.rubric) -> None:
         if len(node) == 1 and node.astext() in ('Footnotes', _('Footnotes')):
             raise nodes.SkipNode
         tag = 'subsubsection'
-        if "level" in node:
-            level = node["level"]
+        if 'heading-level' in node:
+            level = node['heading-level']
             try:
                 tag = self.sectionnames[self.top_sectionlevel - 1 + level]
             except Exception:
@@ -992,7 +992,7 @@ class LaTeXTranslator(SphinxTranslator):
         self.context.append('}' + CR)
         self.in_title = 1
 
-    def depart_rubric(self, node: Element) -> None:
+    def depart_rubric(self, node: nodes.rubric) -> None:
         self.in_title = 0
         self.body.append(self.context.pop())
 

{sphinx-7.4.0.dist-info → sphinx-7.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Sphinx
-Version: 7.4.0
+Version: 7.4.2
 Summary: Python documentation generator
 Author-email: Georg Brandl <georg@python.org>
 Requires-Python: >=3.9

{sphinx-7.4.0.dist-info → sphinx-7.4.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-sphinx/__init__.py,sha256=d62Tm-O3KPVsvSnDn34bpL4tHlSuhXItJrN4R10PEV8,1690
+sphinx/__init__.py,sha256=lDK1jQBltbq6fbBeFLlrGp62wnx3ipLhR8LBPyXErR0,1690
 sphinx/__main__.py,sha256=wIifwXlZHdi4gtQmkJ6KF0BsflvD9o0Wd5nARTdJc8A,127
 sphinx/addnodes.py,sha256=EQTIi9Zta6DaNa-2WGE3l9AVjdp7WzwwrfwRnax8vXE,18707
 sphinx/application.py,sha256=5QXM7tYRt1s4q00GHPtAK2EIxu6G_UkzMB3MOKOkuUI,57793
@@ -51,7 +51,7 @@ sphinx/cmd/quickstart.py,sha256=XxF1hMsn7H0VZGy64yLEbTTSFc9ZANZHWIvEk21GOUE,2424
 sphinx/directives/__init__.py,sha256=PnsmKvTOcRgfwzp8NFfhmdVJfbcDktcHD7sd1fnddNE,15100
 sphinx/directives/code.py,sha256=yTy4GsZZ6PYKdnhysJpEj3eYRIpDEoYIsWtm9io59p8,18264
 sphinx/directives/other.py,sha256=IMVRQyPT_zkU34V4A9pdsR8S4HnryoJutYCpt4LnFh8,16492
-sphinx/directives/patches.py,sha256=CwiAnkOhMb_huuW3xaoldki1I3bhvqEylaeVutlEB5U,7732
+sphinx/directives/patches.py,sha256=cK4KPUe1U7MOOxQzXshAJEMPKnpG5_T-7Ch5pOB5PXs,7801
 sphinx/domains/__init__.py,sha256=LLaAZAn0984o2LSYH_UZcEdndE9azmNUDALae74nuRE,15392
 sphinx/domains/changeset.py,sha256=J9LWgh2dtBAXbX6L3a4J8YB3-wA62AMS1GolKTQsWJ0,5692
 sphinx/domains/citation.py,sha256=G9i8IYsR1tsGfAln7Z9Z_wNL2FDM2sXbWgTojxN_77I,5767
@@ -73,7 +73,7 @@ sphinx/domains/python/__init__.py,sha256=mWEy28rgBrk1hBGoN5SOTw9PptIg58ghby_1iuL
 sphinx/domains/python/_annotations.py,sha256=bLay4nHo1L7KxfX2exE2ttTLqwOnMBDVEg7r6v_YeSY,22302
 sphinx/domains/python/_object.py,sha256=5DjvYfjQwmJToudJQNSogfP4LIAMU8fp6rd-Xe6nhzY,17011
 sphinx/domains/std/__init__.py,sha256=gXNUycqNBSeFBXg89WStSk9pZsvaS6BuDtTBee-DWoM,49514
-sphinx/environment/__init__.py,sha256=-dweW4btgtJsku0MGp4WLEnnN98ZWTaZQ4qgCtFSNWU,32545
+sphinx/environment/__init__.py,sha256=8078TrLXUERa0RbBBLZxwPDndYqhqTZNrwlL2zwzj6A,32545
 sphinx/environment/adapters/__init__.py,sha256=VnDotW2UbxjWeVITmz7iTsVrzqQcvmLHr3euKqqKHwo,34
 sphinx/environment/adapters/asset.py,sha256=huGHWMReM80cD9b88thQeqvJZG3G6BCnG_DY2uIZt0Q,418
 sphinx/environment/adapters/indexentries.py,sha256=v_U51MZyYgkwVcFG0cCVICwSJALjlIxFHCpcxg2Nqbs,8926
@@ -575,17 +575,17 @@ sphinx/util/rst.py,sha256=YY2Wk4Pn1vNQAi1iDjUCYeBYGutYYo4curTpdsVcyKE,3585
 sphinx/util/tags.py,sha256=K6tiZhx-V60aKZ4Z3ie5kasMYGGV_WPUTq8ncWlWnJM,3927
 sphinx/util/template.py,sha256=jxQgY24NYYfMc1M951DKQn2oSk0-wxEGqKBPR98eRbc,5146
 sphinx/util/texescape.py,sha256=eGHE_GX732SVeSHcmprXbOa2euwNh37kREwWPTY1hvY,5442
-sphinx/util/typing.py,sha256=7nGQTUAJlv7EqoUgE8VH01B81B_fSnkwgtQeI2A4VOo,22476
+sphinx/util/typing.py,sha256=nSZtWgMw4IqRkjplxPANTlTd7Nj5hvUrT6VLVqThO9M,22617
 sphinx/writers/__init__.py,sha256=efGdnx4MWlPEDzXACf4Q18Oi3GTyY5Ob14I_j3XXtXc,31
 sphinx/writers/html.py,sha256=ptitqWUkA4wnY0HuPIjy1GuKG4cOPCuPlAdH7aMRhyg,1604
-sphinx/writers/html5.py,sha256=oyNYkmFG8TzPwLFoezcfOG8NRzG5X81bAmLyMeP3XjI,37613
-sphinx/writers/latex.py,sha256=5lvrv8j3nfU_fgR0uHXTjbha0hVzbu-Lf8fOC1l0zSw,92215
+sphinx/writers/html5.py,sha256=KmE-WAPcIX1laEHXBX2H8zRwCDC66vGzys_32UV5yM4,37671
+sphinx/writers/latex.py,sha256=n4TNdWkLcdctaKMH85HPAvqhGiTewW83wgz9pl4uT90,92241
 sphinx/writers/manpage.py,sha256=iLoC4i81W52dTl8Kpug65CV1M7cCz1buGgsN7FhazYo,16215
 sphinx/writers/texinfo.py,sha256=UU3Zrt-zBgdwYgqj4BJFNthggzMr_Gllx2ewBeWrkcI,53451
 sphinx/writers/text.py,sha256=HEiYXsWXO9QVOazg2V3D0ehGTnK38dAtYP9v0rst684,42964
 sphinx/writers/xml.py,sha256=NyDl82hCFSRiHrCZV6vBfn4AsAyXH6khtSJEfhOX8a0,1502
-sphinx-7.4.0.dist-info/entry_points.txt,sha256=KU_c9jqXj7yyZylSz11XRIXG3gAZApQa0d5DmcfyA7M,188
-sphinx-7.4.0.dist-info/LICENSE.rst,sha256=HdZPUFcmQaLySBc9fKvRC5aOUNkxL9Gz5py0p6XGDk4,3135
-sphinx-7.4.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-sphinx-7.4.0.dist-info/METADATA,sha256=erbPWcF18lvTzKg5XOLnXiMz7zGrVHXE5rU5n1O3YjY,6113
-sphinx-7.4.0.dist-info/RECORD,,
+sphinx-7.4.2.dist-info/entry_points.txt,sha256=KU_c9jqXj7yyZylSz11XRIXG3gAZApQa0d5DmcfyA7M,188
+sphinx-7.4.2.dist-info/LICENSE.rst,sha256=HdZPUFcmQaLySBc9fKvRC5aOUNkxL9Gz5py0p6XGDk4,3135
+sphinx-7.4.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+sphinx-7.4.2.dist-info/METADATA,sha256=FR4tZh9yXkMubBSP2JCgiwF_EG6fMmBxZkJ8qHYQonQ,6113
+sphinx-7.4.2.dist-info/RECORD,,