IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use get_settings() from Docutils 0.19 (#10624)

Browse Source
This commit is contained in:
Adam Turner 2022-07-02 10:56:29 +01:00 committed by GitHub
parent cf8d5357fc
commit 8d99168794
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sphinx/builders/html/__init__.py
View File

@ -229,8 +229,11 @@ class StandaloneHTMLBuilder(Builder):
source_class=DocTreeInput, source_class=DocTreeInput,
destination=StringOutput(encoding='unicode'), destination=StringOutput(encoding='unicode'),
) )
op = pub.setup_option_parser(output_encoding='unicode', traceback=True) if docutils.__version_info__[:2] >= (0, 19):
pub.settings = op.get_default_values() pub.get_settings(output_encoding='unicode', traceback=True)
else:
op = pub.setup_option_parser(output_encoding='unicode', traceback=True)
pub.settings = op.get_default_values()
self._publisher = pub self._publisher = pub
def init(self) -> None: def init(self) -> None:

6
sphinx/io.py
View File

@ -3,6 +3,7 @@ import codecs
import warnings import warnings
from typing import TYPE_CHECKING, Any, List, Type from typing import TYPE_CHECKING, Any, List, Type
import docutils
from docutils import nodes from docutils import nodes
from docutils.core import Publisher from docutils.core import Publisher
from docutils.frontend import Values from docutils.frontend import Values
@ -212,5 +213,8 @@ def create_publisher(app: "Sphinx", filetype: str) -> Publisher:
# Propagate exceptions by default when used programmatically: # Propagate exceptions by default when used programmatically:
defaults = {"traceback": True, **app.env.settings} defaults = {"traceback": True, **app.env.settings}
# Set default settings # Set default settings
pub.settings = pub.setup_option_parser(**defaults).get_default_values() # type: ignore if docutils.__version_info__[:2] >= (0, 19):
pub.get_settings(**defaults) # type: ignore[arg-type]
else:
pub.settings = pub.setup_option_parser(**defaults).get_default_values() # type: ignore
return pub return pub