IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Closes #1128: Fix Unicode errors when trying to format time strings with a non-standard locale.

Browse Source
This commit is contained in:
Georg Brandl 2013-03-30 17:53:04 +01:00
parent b9696a9d9d
commit 77d2a90f36
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -160,6 +160,8 @@ Bugs fixed
width, table layout width and text wrap width. width, table layout width and text wrap width.
* Fix leading space in LaTeX table header cells. * Fix leading space in LaTeX table header cells.
* #1132: Fix LaTeX table output for multi-row cells in the first column. * #1132: Fix LaTeX table output for multi-row cells in the first column.
* #1128: Fix Unicode errors when trying to format time strings with a
non-standard locale.
* #1127: Fix traceback when autodoc tries to tokenize a non-Python file. * #1127: Fix traceback when autodoc tries to tokenize a non-Python file.
* #1126: Fix double-hyphen to en-dash conversion in wrong places such as * #1126: Fix double-hyphen to en-dash conversion in wrong places such as
command-line option names in LaTeX. command-line option names in LaTeX.

10
sphinx/util/osutil.py
View File

@ -14,6 +14,7 @@ import re
import sys import sys
import time import time
import errno import errno
import locale
import shutil import shutil
from os import path from os import path
@ -135,10 +136,12 @@ def make_filename(string):
return no_fn_re.sub('', string) return no_fn_re.sub('', string)
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
def ustrftime(format, *args):
# strftime for unicode strings # strftime for unicode strings
return time.strftime(unicode(format).encode('utf-8'), *args) \ def ustrftime(format, *args):
.decode('utf-8') # if a locale is set, the time strings are encoded in the encoding
# given by LC_TIME; if that is available, use it
enc = locale.getlocale(locale.LC_TIME)[1] or 'utf-8'
return time.strftime(unicode(format).encode(enc), *args).decode(enc)
else: else:
ustrftime = time.strftime ustrftime = time.strftime
@ -159,4 +162,3 @@ def find_catalog(docname, compaction):
return ret return ret
fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding() fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()