[Docutils-checkins] SF.net SVN: docutils:[8967] trunk/docutils

[<mi...@us...>]

Revision: 8967
          http://sourceforge.net/p/docutils/code/8967
Author:   milde
Date:     2022-01-26 09:32:41 +0000 (Wed, 26 Jan 2022)
Log Message:
-----------
Fix [bug:#443].

Add "html writers" to
`docutils.writers._html_base.Writer.config_section_dependencies`.
Now, it works "out of the box" for writers inheriting from `_html_base`.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/_html_base.py
    trunk/docutils/docutils/writers/html4css1/__init__.py
    trunk/docutils/docutils/writers/html5_polyglot/__init__.py
    trunk/docutils/docutils/writers/xetex/__init__.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2022-01-25 16:39:15 UTC (rev 8966)
+++ trunk/docutils/HISTORY.txt	2022-01-26 09:32:41 UTC (rev 8967)
@@ -58,8 +58,12 @@
 
   - Add deprecation warning.
 
-* docutils/writers/pep_html/:
+* docutils/writers/_html_base.py
 
+  - Add 'html writers' to `config_section_dependencies`. Fixes bug #443.
+
+* docutils/writers/pep_html/
+
   - use "https:" scheme in "python_home" URL default. 
   
 * test/DocutilsTestSupport.py

Modified: trunk/docutils/docutils/writers/_html_base.py
===================================================================
--- trunk/docutils/docutils/writers/_html_base.py	2022-01-25 16:39:15 UTC (rev 8966)
+++ trunk/docutils/docutils/writers/_html_base.py	2022-01-26 09:32:41 UTC (rev 8967)
@@ -130,8 +130,8 @@
 
     settings_defaults = {'output_encoding_error_handler': 'xmlcharrefreplace'}
 
-    config_section = 'html writers'
-    config_section_dependencies = ('writers', )
+    config_section = 'html base writer' # overwrite in subclass
+    config_section_dependencies = ('writers', 'html writers')
 
     visitor_attributes = (
         'head_prefix', 'head', 'stylesheet', 'body_prefix',

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2022-01-25 16:39:15 UTC (rev 8966)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2022-01-26 09:32:41 UTC (rev 8967)
@@ -38,9 +38,9 @@
     default_template = os.path.join(
         os.path.dirname(os.path.abspath(__file__)), 'template.txt')
 
+    # use a copy of the parent spec with some modifications
     settings_spec = frontend.filter_settings_spec(
         writers._html_base.Writer.settings_spec,
-        # update specs with changed defaults or help string
         template =
          ('Template file. (UTF-8 encoded, default: "%s")' % default_template,
           ['--template'],
@@ -95,7 +95,6 @@
         ))
 
     config_section = 'html4css1 writer'
-    config_section_dependencies = ('writers', 'html writers')
 
     def __init__(self):
         self.parts = {}

Modified: trunk/docutils/docutils/writers/html5_polyglot/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html5_polyglot/__init__.py	2022-01-25 16:39:15 UTC (rev 8966)
+++ trunk/docutils/docutils/writers/html5_polyglot/__init__.py	2022-01-26 09:32:41 UTC (rev 8967)
@@ -44,9 +44,9 @@
     default_template = os.path.join(
         os.path.dirname(os.path.abspath(__file__)), 'template.txt')
 
+    # use a copy of the parent spec with some modifications
     settings_spec = frontend.filter_settings_spec(
         writers._html_base.Writer.settings_spec,
-        # update specs with changed defaults or help string
         template =
          ('Template file. (UTF-8 encoded, default: "%s")' % default_template,
           ['--template'],

Modified: trunk/docutils/docutils/writers/xetex/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/xetex/__init__.py	2022-01-25 16:39:15 UTC (rev 8966)
+++ trunk/docutils/docutils/writers/xetex/__init__.py	2022-01-26 09:32:41 UTC (rev 8967)
@@ -48,9 +48,11 @@
     config_section_dependencies = ('writers', 'latex writers',
             'latex2e writer') # TODO: remove dependency on `latex2e writer`.
 
+    # use a copy of the parent spec with some modifications:
     settings_spec = frontend.filter_settings_spec(
         latex2e.Writer.settings_spec,
-        'font_encoding', # removed settings
+        # removed settings
+        'font_encoding',
         # changed settings:
         template=('Template file. Default: "%s".' % default_template,
                   ['--template'],

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.