summaryrefslogtreecommitdiff
path: root/docutils
diff options
context:
space:
mode:
Diffstat (limited to 'docutils')
-rw-r--r--docutils/docs/ref/doctree.txt6
-rw-r--r--docutils/docs/ref/rst/directives.txt2
-rwxr-xr-xdocutils/test/test_settings.py1
-rwxr-xr-xdocutils/tools/buildhtml.py2
-rwxr-xr-xdocutils/tools/dev/profile_docutils.py2
-rwxr-xr-xdocutils/tools/quicktest.py2
-rwxr-xr-xdocutils/tools/rst2html.py2
-rwxr-xr-xdocutils/tools/rst2html4.py2
-rwxr-xr-xdocutils/tools/rst2latex.py2
-rwxr-xr-xdocutils/tools/rst2man.py2
-rwxr-xr-xdocutils/tools/rst2odt.py2
-rwxr-xr-xdocutils/tools/rst2pseudoxml.py2
-rwxr-xr-xdocutils/tools/rst2s5.py2
-rwxr-xr-xdocutils/tools/rst2xetex.py2
-rwxr-xr-xdocutils/tools/rst2xml.py2
-rwxr-xr-xdocutils/tools/rstpep2html.py2
-rw-r--r--docutils/tox.ini3
17 files changed, 17 insertions, 21 deletions
diff --git a/docutils/docs/ref/doctree.txt b/docutils/docs/ref/doctree.txt
index ab1342a1e..e36197a7e 100644
--- a/docutils/docs/ref/doctree.txt
+++ b/docutils/docs/ref/doctree.txt
@@ -424,8 +424,8 @@ Details
:Analogues:
``admonition`` has no direct analogues in common DTDs. It can be
emulated with primitives and type effects.
-
- The specific admonitions caution_, note_, tip_, and warning_
+
+ The specific admonitions caution_, note_, tip_, and warning_
are analogous to the respective DocBook elements.
:Processing:
@@ -2266,7 +2266,7 @@ Details
The `DocBook "footnote"`_ element combines features of ``footnote``
and footnote_reference_.
-
+
The DPub ARIA role `"doc-footnote"`__ may be used to mark a (conforming__)
`HTML emulation`__ as "ancillary information, such as a citation or
commentary, that provides additional context to a referenced passage
diff --git a/docutils/docs/ref/rst/directives.txt b/docutils/docs/ref/rst/directives.txt
index e9828aaf9..bc7a2938d 100644
--- a/docutils/docs/ref/rst/directives.txt
+++ b/docutils/docs/ref/rst/directives.txt
@@ -54,7 +54,7 @@ reStructuredText Directives`_.
Admonitions ("safety messages" or "hazard statements") can appear anywhere
an ordinary body element can. They contain arbitrary body elements.
Typically, an admonition is rendered as an offset block in a document,
-sometimes outlined or shaded,
+sometimes outlined or shaded.
Docutils defines a `generic admonition`_ as well as a set of
`specific admonitions`_.
diff --git a/docutils/test/test_settings.py b/docutils/test/test_settings.py
index 94c116564..8be4b94e5 100755
--- a/docutils/test/test_settings.py
+++ b/docutils/test/test_settings.py
@@ -356,6 +356,5 @@ class HelperFunctionsTests(unittest.TestCase):
reporter.set_conditions('foo', 1, 4) # trigger warning
-
if __name__ == '__main__':
unittest.main()
diff --git a/docutils/tools/buildhtml.py b/docutils/tools/buildhtml.py
index dfcb01571..f31d887b4 100755
--- a/docutils/tools/buildhtml.py
+++ b/docutils/tools/buildhtml.py
@@ -18,7 +18,7 @@ __docformat__ = 'reStructuredText'
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from fnmatch import fnmatch
diff --git a/docutils/tools/dev/profile_docutils.py b/docutils/tools/dev/profile_docutils.py
index 8a54c0f92..17187488b 100755
--- a/docutils/tools/dev/profile_docutils.py
+++ b/docutils/tools/dev/profile_docutils.py
@@ -35,5 +35,5 @@ stats.print_stats(40)
try:
exec(open(os.environ['PYTHONSTARTUP']).read())
-except:
+except Exception:
pass
diff --git a/docutils/tools/quicktest.py b/docutils/tools/quicktest.py
index 8093c0aba..ccc8139eb 100755
--- a/docutils/tools/quicktest.py
+++ b/docutils/tools/quicktest.py
@@ -8,7 +8,7 @@
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
import sys
diff --git a/docutils/tools/rst2html.py b/docutils/tools/rst2html.py
index fc8bf3751..2d3dc6e03 100755
--- a/docutils/tools/rst2html.py
+++ b/docutils/tools/rst2html.py
@@ -11,7 +11,7 @@ A minimal front end to the Docutils Publisher, producing HTML.
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline, default_description
diff --git a/docutils/tools/rst2html4.py b/docutils/tools/rst2html4.py
index a32368e6e..313000f6f 100755
--- a/docutils/tools/rst2html4.py
+++ b/docutils/tools/rst2html4.py
@@ -14,7 +14,7 @@ and almost to HTML 4.01 transitional (except for closing empty tags).
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline, default_description
diff --git a/docutils/tools/rst2latex.py b/docutils/tools/rst2latex.py
index c90864f6c..3786f052e 100755
--- a/docutils/tools/rst2latex.py
+++ b/docutils/tools/rst2latex.py
@@ -11,7 +11,7 @@ A minimal front end to the Docutils Publisher, producing LaTeX.
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline
diff --git a/docutils/tools/rst2man.py b/docutils/tools/rst2man.py
index c19ca3bf3..bd5a26db1 100755
--- a/docutils/tools/rst2man.py
+++ b/docutils/tools/rst2man.py
@@ -15,7 +15,7 @@ man page writer to output from ReStructuredText source.
import locale
try:
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline, default_description
diff --git a/docutils/tools/rst2odt.py b/docutils/tools/rst2odt.py
index 21f537016..243a9661d 100755
--- a/docutils/tools/rst2odt.py
+++ b/docutils/tools/rst2odt.py
@@ -11,7 +11,7 @@ A front end to the Docutils Publisher, producing OpenOffice documents.
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline_to_binary, default_description
diff --git a/docutils/tools/rst2pseudoxml.py b/docutils/tools/rst2pseudoxml.py
index a7b7a02cc..f5737ccd0 100755
--- a/docutils/tools/rst2pseudoxml.py
+++ b/docutils/tools/rst2pseudoxml.py
@@ -11,7 +11,7 @@ A minimal front end to the Docutils Publisher, producing pseudo-XML.
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline, default_description
diff --git a/docutils/tools/rst2s5.py b/docutils/tools/rst2s5.py
index de1861fb9..7e475915b 100755
--- a/docutils/tools/rst2s5.py
+++ b/docutils/tools/rst2s5.py
@@ -12,7 +12,7 @@ the S5 template system.
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline, default_description
diff --git a/docutils/tools/rst2xetex.py b/docutils/tools/rst2xetex.py
index 7a9effa3e..63867dd7a 100755
--- a/docutils/tools/rst2xetex.py
+++ b/docutils/tools/rst2xetex.py
@@ -11,7 +11,7 @@ A minimal front end to the Docutils Publisher, producing Lua/XeLaTeX code.
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline
diff --git a/docutils/tools/rst2xml.py b/docutils/tools/rst2xml.py
index 522c024ce..6fddd91f6 100755
--- a/docutils/tools/rst2xml.py
+++ b/docutils/tools/rst2xml.py
@@ -11,7 +11,7 @@ A minimal front end to the Docutils Publisher, producing Docutils XML.
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline, default_description
diff --git a/docutils/tools/rstpep2html.py b/docutils/tools/rstpep2html.py
index 4ef81f6b2..ff79a2d24 100755
--- a/docutils/tools/rstpep2html.py
+++ b/docutils/tools/rstpep2html.py
@@ -12,7 +12,7 @@ A minimal front end to the Docutils Publisher, producing HTML from PEP
try:
import locale
locale.setlocale(locale.LC_ALL, '')
-except:
+except Exception:
pass
from docutils.core import publish_cmdline, default_description
diff --git a/docutils/tox.ini b/docutils/tox.ini
index df7c06471..c8fc41986 100644
--- a/docutils/tox.ini
+++ b/docutils/tox.ini
@@ -84,7 +84,4 @@ per-file-ignores =
test/test_writers/test_manpage.py:E121,E128,E501,W291
test/test_writers/test_latex2e.py:E122,E128,E501,W291,W293
- # ignore all errors when setting locale
- tools/*.py:E722
-
exclude = .venv,.tox,dist,*egg,build
View Lorry Controller Status