From 390e5a6ec211479b6024c03188aec838585ac51e Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 1 Jan 2017 22:38:33 +0900 Subject: [PATCH] Drop deprecated options for epub3 builder --- doc/config.rst | 14 -------------- sphinx/builders/epub3.py | 18 ------------------ 2 files changed, 32 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index faba1152f..f57e02e64 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1510,20 +1510,6 @@ the `Dublin Core metadata `_. .. [#] https://developer.mozilla.org/en-US/docs/Web/CSS/writing-mode -.. confval:: epub3_page_progression_direction - - The global direction in which the content flows. - Allowed values are ``'ltr'`` (left-to-right), ``'rtl'`` (right-to-left) and - ``'default'``. The default value is ``'ltr'``. - - When the ``'default'`` value is specified, the Author is expressing no - preference and the Reading System may chose the rendering direction. - - .. versionadded:: 1.4 - - .. deprecated:: 1.5 - Use ``epub_writing_mode`` instead. - .. _latex-options: Options for LaTeX output diff --git a/sphinx/builders/epub3.py b/sphinx/builders/epub3.py index ca4a44749..c2022e622 100644 --- a/sphinx/builders/epub3.py +++ b/sphinx/builders/epub3.py @@ -260,31 +260,13 @@ class Epub3Builder(EpubBuilder): self.files.append(outname) -def validate_config_values(app): - if app.config.epub3_description is not None: - logger.warning('epub3_description is deprecated. Use epub_description instead.') - app.config.epub_description = app.config.epub3_description - - if app.config.epub3_contributor is not None: - logger.warning('epub3_contributor is deprecated. Use epub_contributor instead.') - app.config.epub_contributor = app.config.epub3_contributor - - if app.config.epub3_page_progression_direction is not None: - logger.warning('epub3_page_progression_direction option is deprecated' - ' from 1.5. Use epub_writing_mode instead.') - - def setup(app): app.setup_extension('sphinx.builders.epub') app.add_builder(Epub3Builder) - app.connect('builder-inited', validate_config_values) app.add_config_value('epub_description', '', 'epub3', string_classes) app.add_config_value('epub_contributor', 'unknown', 'epub3', string_classes) app.add_config_value('epub_writing_mode', 'horizontal', 'epub3', string_classes) - app.add_config_value('epub3_description', None, 'epub3', string_classes) - app.add_config_value('epub3_contributor', None, 'epub3', string_classes) - app.add_config_value('epub3_page_progression_direction', None, 'epub3', string_classes) return { 'version': 'builtin',