summaryrefslogtreecommitdiff
path: root/sphinx/builders/applehelp.py
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2018-12-16 11:25:18 -0800
committerJon Dufresne <jon.dufresne@gmail.com>2018-12-16 11:35:06 -0800
commit80861d105bf5cca89aebd7efb1256ad04471ce8f (patch)
treec959ab07a99fd0b6ab694d3ce296f44a466ad88b /sphinx/builders/applehelp.py
parent30ec4b6bba3cb256b700ca1d7438ddd01b3e948c (diff)
downloadsphinx-git-80861d105bf5cca89aebd7efb1256ad04471ce8f.tar.gz
Deprecate sphinx.config.string_classes; remove all internal uses
With only a single text type across supported Python versions, the string_classes is no longer necessary. Internally, all uses were converted to the value `[str]`. For .add_config_value() uses that also supply a default string, the type is inferred.
Diffstat (limited to 'sphinx/builders/applehelp.py')
-rw-r--r--sphinx/builders/applehelp.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/sphinx/builders/applehelp.py b/sphinx/builders/applehelp.py
index e8cf5b279..36312bc98 100644
--- a/sphinx/builders/applehelp.py
+++ b/sphinx/builders/applehelp.py
@@ -17,7 +17,6 @@ import subprocess
from os import path, environ
from sphinx.builders.html import StandaloneHTMLBuilder
-from sphinx.config import string_classes
from sphinx.errors import SphinxError
from sphinx.locale import __
from sphinx.util import logging
@@ -274,17 +273,17 @@ def setup(app):
app.add_config_value('applehelp_bundle_name',
lambda self: make_filename(self.project), 'applehelp')
- app.add_config_value('applehelp_bundle_id', None, 'applehelp', string_classes)
+ app.add_config_value('applehelp_bundle_id', None, 'applehelp', [str])
app.add_config_value('applehelp_dev_region', 'en-us', 'applehelp')
app.add_config_value('applehelp_bundle_version', '1', 'applehelp')
- app.add_config_value('applehelp_icon', None, 'applehelp', string_classes)
+ app.add_config_value('applehelp_icon', None, 'applehelp', [str])
app.add_config_value('applehelp_kb_product',
lambda self: '%s-%s' % (make_filename(self.project), self.release),
'applehelp')
- app.add_config_value('applehelp_kb_url', None, 'applehelp', string_classes)
- app.add_config_value('applehelp_remote_url', None, 'applehelp', string_classes)
- app.add_config_value('applehelp_index_anchors', False, 'applehelp', string_classes)
- app.add_config_value('applehelp_min_term_length', None, 'applehelp', string_classes)
+ app.add_config_value('applehelp_kb_url', None, 'applehelp', [str])
+ app.add_config_value('applehelp_remote_url', None, 'applehelp', [str])
+ app.add_config_value('applehelp_index_anchors', False, 'applehelp', [str])
+ app.add_config_value('applehelp_min_term_length', None, 'applehelp', [str])
app.add_config_value('applehelp_stopwords',
lambda self: self.language or 'en', 'applehelp')
app.add_config_value('applehelp_locale', lambda self: self.language or 'en', 'applehelp')