1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
|
From: Dmitry Shachnev <mitya57@debian.org>
Date: Thu, 8 Oct 2015 11:57:13 -0700
Subject: make the help message not depend on runtime encoding
This message goes into manpage, and we do not want the manpage to misleadingly
mention build-time locale there.
Bug: https://bugs.debian.org/791587
Forwarded: no
Last-Update: 2025-09-18
---
docutils/frontend.py | 2 +-
test/data/help/docutils.rst | 2 +-
test/data/help/rst2html.rst | 2 +-
test/data/help/rst2latex.rst | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docutils/frontend.py b/docutils/frontend.py
index d5415f4..e3f1ac1 100644
--- a/docutils/frontend.py
+++ b/docutils/frontend.py
@@ -818,7 +818,7 @@ class OptionParser(optparse.OptionParser, docutils.SettingsSpec):
(SUPPRESS_HELP, ['--output-encoding-error-handler'],
{'default': 'strict', 'validator': validate_encoding_error_handler}),
('Specify text encoding and optionally the error handler'
- f' for error output. Default: {default_error_encoding}.',
+ ' for error output. Default: system encoding.',
['--error-encoding', '-e'],
{'metavar': '<name[:handler]>', 'default': default_error_encoding,
'validator': validate_encoding_and_error_handler}),
diff --git a/test/data/help/docutils.rst b/test/data/help/docutils.rst
index e0235ae..7723c80 100644
--- a/test/data/help/docutils.rst
+++ b/test/data/help/docutils.rst
@@ -66,7 +66,7 @@ General Docutils Options
handler for output. Default: utf-8.
--error-encoding=<name[:handler]>, -e <name[:handler]>
Specify text encoding and optionally the error handler
- for error output. Default: utf-8.
+ for error output. Default: system encoding.
--language=<tag>, -l <tag>
Specify the language (as BCP 47 language tag).
Default: en.
diff --git a/test/data/help/rst2html.rst b/test/data/help/rst2html.rst
index 25b5bf5..aacbd92 100644
--- a/test/data/help/rst2html.rst
+++ b/test/data/help/rst2html.rst
@@ -67,7 +67,7 @@ General Docutils Options
handler for output. Default: utf-8.
--error-encoding=<name[:handler]>, -e <name[:handler]>
Specify text encoding and optionally the error handler
- for error output. Default: utf-8.
+ for error output. Default: system encoding.
--language=<tag>, -l <tag>
Specify the language (as BCP 47 language tag).
Default: en.
diff --git a/test/data/help/rst2latex.rst b/test/data/help/rst2latex.rst
index 947ea67..c73d6c1 100644
--- a/test/data/help/rst2latex.rst
+++ b/test/data/help/rst2latex.rst
@@ -67,7 +67,7 @@ General Docutils Options
handler for output. Default: utf-8.
--error-encoding=<name[:handler]>, -e <name[:handler]>
Specify text encoding and optionally the error handler
- for error output. Default: utf-8.
+ for error output. Default: system encoding.
--language=<tag>, -l <tag>
Specify the language (as BCP 47 language tag).
Default: en.
|