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 pull request #5052 from tk0miya/5016_settings_spec_for_recommonmark

Browse Source 
Fix #5016: crashed when recommonmark.AutoStrictify is enabled
This commit is contained in:
Takeshi KOMIYA 2018-06-08 20:51:12 +09:00 committed by GitHub
commit 1e60076b17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -18,8 +18,7 @@ Bugs fixed
* #5037: LaTeX ``\sphinxupquote{}`` breaks in Russian * #5037: LaTeX ``\sphinxupquote{}`` breaks in Russian
* sphinx.testing uses deprecated pytest API; ``Node.get_marker(name)`` * sphinx.testing uses deprecated pytest API; ``Node.get_marker(name)``
* #5016: ``character_level_inline_markup`` setting is not initialized for * #5016: crashed when recommonmark.AutoStrictify is enabled
combination of non reST source parsers (ex. recommonmark) and docutils-0.13
* #5022: latex: crashed with docutils package provided by Debian/Ubuntu * #5022: latex: crashed with docutils package provided by Debian/Ubuntu
Testing Testing

1
sphinx/environment/__init__.py
View File

@ -66,7 +66,6 @@ default_settings = {
'halt_level': 5, 'halt_level': 5,
'file_insertion_enabled': True, 'file_insertion_enabled': True,
'smartquotes_locales': [], 'smartquotes_locales': [],
'character_level_inline_markup': False, # for docutils-0.13.1 or older
} }
# This is increased every time an environment attribute is added # This is increased every time an environment attribute is added

8
sphinx/io.py
View File

@ -13,6 +13,7 @@ import re
from docutils.core import Publisher from docutils.core import Publisher
from docutils.io import FileInput, NullOutput from docutils.io import FileInput, NullOutput
from docutils.parsers.rst import Parser as RSTParser
from docutils.readers import standalone from docutils.readers import standalone
from docutils.statemachine import StringList, string2lines from docutils.statemachine import StringList, string2lines
from docutils.writers import UnfilteredWriter from docutils.writers import UnfilteredWriter
@ -282,6 +283,13 @@ def read_doc(app, env, filename):
source = input_class(app, env, source=None, source_path=filename, source = input_class(app, env, source=None, source_path=filename,
encoding=env.config.source_encoding) encoding=env.config.source_encoding)
parser = app.registry.create_source_parser(app, filename) parser = app.registry.create_source_parser(app, filename)
if parser.__class__.__name__ == 'CommonMarkParser' and parser.settings_spec == ():
# a workaround for recommonmark
# If recommonmark.AutoStrictify is enabled, the parser invokes reST parser
# internally. But recommonmark-0.4.0 does not provide settings_spec for reST
# parser. As a workaround, this copies settings_spec for RSTParser to the
# CommonMarkParser.
parser.settings_spec = RSTParser.settings_spec
pub = Publisher(reader=reader, pub = Publisher(reader=reader,
parser=parser, parser=parser,