From fa3e0ca6827c12999e09d18593abcc98fb5ecca2 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 16 Jun 2018 18:33:09 +0900 Subject: [PATCH] Close #5035: qthelp builder allows dashes in :confval:`qthelp_namespace` --- CHANGES | 1 + sphinx/builders/qthelp.py | 2 +- tests/test_build_qthelp.py | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 2c4374abe..1bf3f113c 100644 --- a/CHANGES +++ b/CHANGES @@ -37,6 +37,7 @@ Incompatible changes * #4983: html: The URL for the productionlist has been changed * Modifying a template variable ``script_files`` in templates is allowed now. Please use ``app.add_js_file()`` instead. +* #5035: qthelp builder allows dashes in :confval:`qthelp_namespace` Deprecated ---------- diff --git a/sphinx/builders/qthelp.py b/sphinx/builders/qthelp.py index 9afe47637..a40cb2709 100644 --- a/sphinx/builders/qthelp.py +++ b/sphinx/builders/qthelp.py @@ -140,7 +140,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder): else: nspace = 'org.sphinx.%s.%s' % (outname, self.config.version) - nspace = re.sub('[^a-zA-Z0-9.]', '', nspace) + nspace = re.sub('[^a-zA-Z0-9.\-]', '', nspace) nspace = re.sub(r'\.+', '.', nspace).strip('.') nspace = nspace.lower() diff --git a/tests/test_build_qthelp.py b/tests/test_build_qthelp.py index a0d4fcf2a..f427ec2d8 100644 --- a/tests/test_build_qthelp.py +++ b/tests/test_build_qthelp.py @@ -88,11 +88,11 @@ def test_qthelp_namespace(app, status, warning): app.builder.build_all() qhp = (app.outdir / 'Python.qhp').text() - assert 'org.sphinxdoc.sphinx' in qhp + assert 'org.sphinx-doc.sphinx' in qhp qhcp = (app.outdir / 'Python.qhcp').text() - assert 'qthelp://org.sphinxdoc.sphinx/doc/index.html' in qhcp - assert 'qthelp://org.sphinxdoc.sphinx/doc/index.html' in qhcp + assert 'qthelp://org.sphinx-doc.sphinx/doc/index.html' in qhcp + assert 'qthelp://org.sphinx-doc.sphinx/doc/index.html' in qhcp @pytest.mark.sphinx('qthelp', testroot='basic')