summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2021-04-07 20:45:05 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2021-04-07 20:45:05 +0000
commitc8b2df744ce6c772f7e0dbf76c904e74e9e63fde (patch)
tree376d58186b157b61df0a2614193eeab585e50eb7
parentb55a73599179e6008dc3633746ab9349f48bc722 (diff)
downloaddocutils-c8b2df744ce6c772f7e0dbf76c904e74e9e63fde.tar.gz
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.) git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@8674 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--docutils/HISTORY.txt11
-rw-r--r--docutils/docutils/writers/latex2e/__init__.py10
-rw-r--r--docutils/docutils/writers/latex2e/docutils.sty2
3 files changed, 15 insertions, 8 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt
index d949170c4..db0c96684 100644
--- a/docutils/HISTORY.txt
+++ b/docutils/HISTORY.txt
@@ -16,16 +16,21 @@
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
- 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)
=========================
diff --git a/docutils/docutils/writers/latex2e/__init__.py b/docutils/docutils/writers/latex2e/__init__.py
index 5bd4f1220..43172767c 100644
--- a/docutils/docutils/writers/latex2e/__init__.py
+++ b/docutils/docutils/writers/latex2e/__init__.py
@@ -13,17 +13,19 @@ __docformat__ = 'reStructuredText'
#
# convention deactivate code by two # i.e. ##.
-import sys
+from io import open
import os
import re
import string
+import sys
try:
import roman
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 @@ def _read_block(fp):
_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 @@ class LaTeXTranslator(nodes.NodeVisitor):
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:
diff --git a/docutils/docutils/writers/latex2e/docutils.sty b/docutils/docutils/writers/latex2e/docutils.sty
index 2eee2382b..be8711e32 100644
--- a/docutils/docutils/writers/latex2e/docutils.sty
+++ b/docutils/docutils/writers/latex2e/docutils.sty
@@ -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,