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

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

Revision: 8941
          http://sourceforge.net/p/docutils/code/8941
Author:   milde
Date:     2022-01-11 17:39:49 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
Module "locale" is supported by Jython since version 2.7.2.

Cf. https://github.com/jython/jython/commit/c5509579

Jython does not support Python3 at the moment,
so we don't need to care about earlier versions in Docutils >= 0.19.

Modified Paths:
--------------
    trunk/docutils/docutils/io.py
    trunk/docutils/docutils/utils/smartquotes.py
    trunk/docutils/docutils/writers/odf_odt/__init__.py
    trunk/docutils/test/test_command_line.py

Modified: trunk/docutils/docutils/io.py
===================================================================
--- trunk/docutils/docutils/io.py	2022-01-11 17:39:37 UTC (rev 8940)
+++ trunk/docutils/docutils/io.py	2022-01-11 17:39:49 UTC (rev 8941)
@@ -10,10 +10,7 @@
 __docformat__ = 'reStructuredText'
 
 import codecs
-try:
-    import locale # module missing in Jython
-except ImportError:
-    pass
+import locale
 import os
 import re
 import sys
@@ -116,9 +113,9 @@
         """
         if self.encoding and self.encoding.lower() == 'unicode':
             assert isinstance(data, str), ('input encoding is "unicode" '
-                                           'but input is not a str object')
+                                           'but input is not a `str` object')
         if isinstance(data, str):
-            # Accept unicode even if self.encoding != 'unicode'.
+            # Accept unicode string even if self.encoding != 'unicode'.
             return data
         if self.encoding:
             # We believe the user/application when the encoding is
@@ -144,8 +141,8 @@
                 # Return decoded, removing BOMs.
                 return decoded.replace(u'\ufeff', u'')
             except (UnicodeError, LookupError) as err:
-                error = err # in Python 3, the <exception instance> is
-                            # local to the except clause
+                # keep exception instance for use outside of the "for" loop.
+                error = err 
         raise UnicodeError(
             'Unable to decode input data.  Tried the following encodings: '
             '%s.\n(%s)' % (', '.join([repr(enc) for enc in encodings]),

Modified: trunk/docutils/docutils/utils/smartquotes.py
===================================================================
--- trunk/docutils/docutils/utils/smartquotes.py	2022-01-11 17:39:37 UTC (rev 8940)
+++ trunk/docutils/docutils/utils/smartquotes.py	2022-01-11 17:39:49 UTC (rev 8941)
@@ -910,8 +910,8 @@
 if __name__ == "__main__":
 
     import itertools
+    import locale
     try:
-        import locale # module missing in Jython
         locale.setlocale(locale.LC_ALL, '') # set to user defaults
         defaultlanguage = locale.getdefaultlocale()[0]
     except:

Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py	2022-01-11 17:39:37 UTC (rev 8940)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py	2022-01-11 17:39:49 UTC (rev 8941)
@@ -16,6 +16,7 @@
 import copy
 from io import StringIO
 import itertools
+import locale
 import os
 import os.path
 import re
@@ -30,11 +31,6 @@
 from xml.dom import minidom
 import zipfile
 
-try:
-    import locale   # module missing in Jython
-except ImportError:
-    pass
-
 import docutils
 from docutils import frontend, nodes, utils, writers, languages
 from docutils.parsers.rst.directives.images import PIL # optional
@@ -41,8 +37,6 @@
 from docutils.readers import standalone
 from docutils.transforms import references
 
-
-
 # Import pygments and odtwriter pygments formatters if possible.
 try:
     import pygments

Modified: trunk/docutils/test/test_command_line.py
===================================================================
--- trunk/docutils/test/test_command_line.py	2022-01-11 17:39:37 UTC (rev 8940)
+++ trunk/docutils/test/test_command_line.py	2022-01-11 17:39:49 UTC (rev 8941)
@@ -7,14 +7,16 @@
 Test module for the command line.
 """
 
+import codecs
+import locale
+import sys
 import unittest
-import sys, codecs
+
 import DocutilsTestSupport # must be imported before docutils
 import docutils.core
 
 # determine/guess the encoding of the standard input:
 try:
-    import locale # module missing in Jython
     locale_encoding = locale.getlocale()[1] or locale.getdefaultlocale()[1]
 except ImportError:
     locale_encoding = None

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