diff options
| author | Georg Brandl <georg@python.org> | 2014-01-17 07:24:23 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-01-17 07:24:23 +0100 |
| commit | d0dccd32a9d4e0960c5be9a801b14a3739670684 (patch) | |
| tree | cbe45b1350fa54ad382f4b0fd1a06955ab6ee985 /tests | |
| parent | 9029a6df8e6040773ee064148f0af84bd143d0e8 (diff) | |
| download | sphinx-d0dccd32a9d4e0960c5be9a801b14a3739670684.tar.gz | |
Remove sphinx.ext.oldcmarkup compatibility extension.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/root/conf.py | 2 | ||||
| -rw-r--r-- | tests/root/objects.txt | 8 | ||||
| -rw-r--r-- | tests/test_build_html.py | 5 |
3 files changed, 1 insertions, 14 deletions
diff --git a/tests/root/conf.py b/tests/root/conf.py index 8025ba33..3399043f 100644 --- a/tests/root/conf.py +++ b/tests/root/conf.py @@ -8,7 +8,7 @@ sys.path.append(os.path.abspath('..')) extensions = ['sphinx.ext.autodoc', 'sphinx.ext.jsmath', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.autosummary', 'sphinx.ext.doctest', 'sphinx.ext.extlinks', - 'sphinx.ext.viewcode', 'sphinx.ext.oldcmarkup', 'ext'] + 'sphinx.ext.viewcode', 'ext'] jsmath_path = 'dummy.js' diff --git a/tests/root/objects.txt b/tests/root/objects.txt index 819c5dff..73661d22 100644 --- a/tests/root/objects.txt +++ b/tests/root/objects.txt @@ -118,14 +118,6 @@ C items .. c:var:: sphinx_global -Old C items (from oldcmarkup ext) ---------------------------------- - -.. cfunction:: Sphinx_Func() - -Refer to :cfunc:`Sphinx_Func`. - - Javascript items ================ diff --git a/tests/test_build_html.py b/tests/test_build_html.py index 2f34e9e4..115ff061 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -44,9 +44,6 @@ reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \ %(root)s/includes.txt:4: WARNING: download file not readable: .*?nonexisting.png %(root)s/markup.txt:\\d+: WARNING: Malformed :option: u'Python c option', does \ not contain option marker - or -- or / -%(root)s/objects.txt:\\d*: WARNING: using old C markup; please migrate to \ -new-style markup \(e.g. c:function instead of cfunction\), see \ -http://sphinx-doc.org/domains.html """ HTML_WARNINGS = ENV_WARNINGS + """\ @@ -191,8 +188,6 @@ HTML_XPATH = { (".//a[@href='#SPHINX_USE_PYTHON']", ''), (".//a[@href='#SphinxType']", ''), (".//a[@href='#sphinx_global']", ''), - # reference from old C markup extension - (".//a[@href='#Sphinx_Func']", ''), # test global TOC created by toctree() (".//ul[@class='current']/li[@class='toctree-l1 current']/a[@href='']", 'Testing object descriptions'), |