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

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

Revision: 8674
          http://sourceforge.net/p/docutils/code/8674
Author:   milde
Date:     2021-04-07 20:45:05 +0000 (Wed, 07 Apr 2021)
Log Message:
-----------
Fix bug #414: error with Py3k when locale encoding is "ascii".

Open "docutils.sty" with encoding set to "utf8".
(We know the encoding as we provide the file.)

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/docutils/writers/latex2e/docutils.sty

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2021-04-07 17:57:27 UTC (rev 8673)
+++ trunk/docutils/HISTORY.txt	2021-04-07 20:45:05 UTC (rev 8674)
@@ -16,10 +16,10 @@
 Changes Since 0.17
 ==================
 
-* manpage writer
+* docutils/writers/latex2e/__init__.py:
 
-  - Apply patch #160: move macro defs above ``.TH``
-    (thanks Willie and sorry for the delay).
+  - Open "docutils.sty" with encoding set to "utf8".
+    Fixes bug #414: error with Py3k when locale encoding is "ascii".
 
 * docutils/parsers/*.py, docutils/transforms/*.py
 
@@ -26,6 +26,11 @@
   - Provide fallbacks for parser config settings
     to facilitate programmatic use.
 
+* docutils/writers/manpage.py
+
+  - Apply patch #160: move macro defs above ``.TH``
+    (thanks Willie and sorry for the delay).
+
 Release 0.17 (2021-04-03)
 =========================
 

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2021-04-07 17:57:27 UTC (rev 8673)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2021-04-07 20:45:05 UTC (rev 8674)
@@ -13,10 +13,11 @@
 #
 # convention deactivate code by two # i.e. ##.
 
-import sys
+from io import open
 import os
 import re
 import string
+import sys
 
 try:
     import roman
@@ -23,7 +24,8 @@
 except ImportError:
     import docutils.utils.roman as roman
 
-from docutils import frontend, nodes, languages, writers, utils, io
+import docutils
+from docutils import frontend, nodes, languages, writers, utils
 from docutils.utils.error_reporting import SafeString
 from docutils.transforms import writer_aux
 from docutils.utils.math import pick_math_environment, unichar2tex
@@ -571,7 +573,7 @@
 
 _du_sty = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                       'docutils.sty')
-with open(_du_sty) as fp:
+with open(_du_sty, encoding='utf8') as fp:
     for line in fp:
         line = line.strip('% \n')
         if not line.endswith('::'):
@@ -1330,7 +1332,7 @@
             if is_package:
                 path = base + '.sty' # ensure extension
             try:
-                content = io.FileInput(source_path=path,
+                content = docutils.io.FileInput(source_path=path,
                                        encoding='utf-8').read()
                 self.settings.record_dependencies.add(path)
             except IOError as err:

Modified: trunk/docutils/docutils/writers/latex2e/docutils.sty
===================================================================
--- trunk/docutils/docutils/writers/latex2e/docutils.sty	2021-04-07 17:57:27 UTC (rev 8673)
+++ trunk/docutils/docutils/writers/latex2e/docutils.sty	2021-04-07 20:45:05 UTC (rev 8674)
@@ -1,6 +1,6 @@
 %% docutils.sty: macros for Docutils LaTeX output.
 %%
-%%   Copyright (c) 2020 Günter Milde
+%%   Copyright © 2020 Günter Milde
 %%   Released under the terms of the `2-Clause BSD license`, in short:
 %%
 %%      Copying and distribution of this file, with or without modification,

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