Skip to content

Commit 4c53f33

Browse files
committed
Preparing 1.5.1 steps 4/16
4. python setup.py check failed doc/announcement.txt contains non-ascii: 'ascii' codec can't encode character u'\xe9' in position 6698: ordinal not in range(128) It was hard to find u'\xe9', because setup.py encoded text to 'utf8' before final check. After removing encoding step: doc/announcement.txt contains non-ascii: 'ascii' codec can't decode byte 0xc3 in position 6698: ordinal not in range(128) Which is fixed. Also fixed reST warning caused by |u symbol: warning: check: Inline substitution_reference start-string without end-string. (line 156)
1 parent 8e9e0fe commit 4c53f33

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CHANGES.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Fixed:
135135
- In case of an error, date fields would lose the calendar help, fixed.
136136
(Ralf Schlatterbeck)
137137
- demo.py usage message improved: explains "nuke" now. (Bernhard Reiter)
138-
- Fix issue2550735 Missing doc for xmlrpc schema. Thanks to C�dric Krier
138+
- Fix issue2550735 Missing doc for xmlrpc schema. Thanks to Cedric Krier
139139
for the patch. (anatoly techtonik)
140140
- Fix two line-break accidents in devel and responsive milestone.item.html
141141
(Thomas Arendsen Hein)
@@ -172,7 +172,7 @@ Fixed:
172172
work because an old help-window is below the main window.
173173
(Ralf Schlatterbeck)
174174
- issue2550811 20% fix: jinja2 template engine now has an example
175-
how to use non-ascii unicode contents with a custom filter ('|u').
175+
how to use non-ascii unicode contents with a custom filter ('| u').
176176
See updates on http://www.roundup-tracker.org/cgi-bin/moin.cgi/Jinja2
177177
(Bernhard Reiter)
178178

doc/announcement.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Fixed:
117117
- In case of an error, date fields would lose the calendar help, fixed.
118118
(Ralf Schlatterbeck)
119119
- demo.py usage message improved: explains "nuke" now. (Bernhard Reiter)
120-
- Fix issue2550735 Missing doc for xmlrpc schema. Thanks to Cédric Krier
120+
- Fix issue2550735 Missing doc for xmlrpc schema. Thanks to Cedric Krier
121121
for the patch. (anatoly techtonik)
122122
- Fix two line-break accidents in devel and responsive milestone.item.html
123123
(Thomas Arendsen Hein)
@@ -154,7 +154,7 @@ Fixed:
154154
work because an old help-window is below the main window.
155155
(Ralf Schlatterbeck)
156156
- issue2550811 20% fix: jinja2 template engine now has an example
157-
how to use non-ascii unicode contents with a custom filter ('|u').
157+
how to use non-ascii unicode contents with a custom filter ('| u').
158158
See updates on http://www.roundup-tracker.org/cgi-bin/moin.cgi/Jinja2
159159
(Bernhard Reiter)
160160

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ def main():
106106
# because the distutils installer will try to use the mbcs codec
107107
# which isn't available on non-windows platforms. See also
108108
# http://bugs.python.org/issue10945
109-
long_description=open('doc/announcement.txt').read().decode('utf8')
109+
long_description=open('doc/announcement.txt').read()
110110
try:
111+
# attempt to interpret string as 'ascii'
111112
long_description = long_description.encode('ascii')
112113
except UnicodeEncodeError, cause:
113114
print >> sys.stderr, "doc/announcement.txt contains non-ascii: %s" \

0 commit comments

Comments
 (0)