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

Merge branch '4.3.x' into 4.x

Browse Source
This commit is contained in:
Takeshi KOMIYA 2021-11-26 02:55:41 +09:00
commit f2295d2f07
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -53,6 +53,7 @@ Bugs fixed
having invalid __doc__ atribute having invalid __doc__ atribute
* #9872: html: Class namespace collision between autodoc signatures and * #9872: html: Class namespace collision between autodoc signatures and
docutils-0.17 docutils-0.17
* #9868: imgmath: Crashed if the dvisvgm command failed to convert equation
* #9864: mathjax: Failed to render equations via MathJax v2. The loading method * #9864: mathjax: Failed to render equations via MathJax v2. The loading method
of MathJax is back to "async" method again of MathJax is back to "async" method again

10
sphinx/ext/imgmath.py
View File

@ -12,7 +12,6 @@ import posixpath
import re import re
import shutil import shutil
import subprocess import subprocess
import sys
import tempfile import tempfile
from os import path from os import path
from subprocess import PIPE, CalledProcessError from subprocess import PIPE, CalledProcessError
@ -43,11 +42,11 @@ templates_path = path.join(package_dir, 'templates', 'imgmath')
class MathExtError(SphinxError): class MathExtError(SphinxError):
category = 'Math extension error' category = 'Math extension error'
def __init__(self, msg: str, stderr: bytes = None, stdout: bytes = None) -> None: def __init__(self, msg: str, stderr: str = None, stdout: str = None) -> None:
if stderr: if stderr:
msg += '\n[stderr]\n' + stderr.decode(sys.getdefaultencoding(), 'replace') msg += '\n[stderr]\n' + stderr
if stdout: if stdout:
msg += '\n[stdout]\n' + stdout.decode(sys.getdefaultencoding(), 'replace') msg += '\n[stdout]\n' + stdout
super().__init__(msg) super().__init__(msg)
@ -135,7 +134,8 @@ def compile_math(latex: str, builder: Builder) -> str:
command.append('math.tex') command.append('math.tex')
try: try:
subprocess.run(command, stdout=PIPE, stderr=PIPE, cwd=tempdir, check=True) subprocess.run(command, stdout=PIPE, stderr=PIPE, cwd=tempdir, check=True,
encoding='ascii')
return path.join(tempdir, 'math.dvi') return path.join(tempdir, 'math.dvi')
except OSError as exc: except OSError as exc:
logger.warning(__('LaTeX command %r cannot be run (needed for math ' logger.warning(__('LaTeX command %r cannot be run (needed for math '

14
tests/test_util_inspect.py
View File

@ -16,7 +16,6 @@ import sys
import types import types
from inspect import Parameter from inspect import Parameter
import _testcapi
import pytest import pytest
from sphinx.util import inspect from sphinx.util import inspect
@ -627,8 +626,6 @@ def test_isattributedescriptor(app):
def __get__(self, obj, typ=None): def __get__(self, obj, typ=None):
pass pass
testinstancemethod = _testcapi.instancemethod(str.__repr__)
assert inspect.isattributedescriptor(Base.prop) is True # property assert inspect.isattributedescriptor(Base.prop) is True # property
assert inspect.isattributedescriptor(Base.meth) is False # method assert inspect.isattributedescriptor(Base.meth) is False # method
assert inspect.isattributedescriptor(Base.staticmeth) is False # staticmethod assert inspect.isattributedescriptor(Base.staticmeth) is False # staticmethod
@ -639,7 +636,16 @@ def test_isattributedescriptor(app):
assert inspect.isattributedescriptor(dict.__dict__['fromkeys']) is False # ClassMethodDescriptorType # NOQA assert inspect.isattributedescriptor(dict.__dict__['fromkeys']) is False # ClassMethodDescriptorType # NOQA
assert inspect.isattributedescriptor(types.FrameType.f_locals) is True # GetSetDescriptorType # NOQA assert inspect.isattributedescriptor(types.FrameType.f_locals) is True # GetSetDescriptorType # NOQA
assert inspect.isattributedescriptor(datetime.timedelta.days) is True # MemberDescriptorType # NOQA assert inspect.isattributedescriptor(datetime.timedelta.days) is True # MemberDescriptorType # NOQA
assert inspect.isattributedescriptor(testinstancemethod) is False # instancemethod (C-API) # NOQA
try:
# _testcapi module cannot be importable in some distro
# refs: https://github.com/sphinx-doc/sphinx/issues/9868
import _testcapi
testinstancemethod = _testcapi.instancemethod(str.__repr__)
assert inspect.isattributedescriptor(testinstancemethod) is False # instancemethod (C-API) # NOQA
except ImportError:
pass
def test_isproperty(app): def test_isproperty(app):