Skip to content

Commit 2ae244e

Browse files
author
Ralf Schlatterbeck
committed
fix long_description again:
we can't build a windows-installer on Linux if the description is unicode, see http://bugs.python.org/issue10945 (also python 2.6 builds roundup-1.4.17.linux-i686.exe when building bdist_wininst where python 2.5 produces roundup-1.4.17.win32.exe, I'm building the windows binary distro with 2.5 now)
1 parent 954b39d commit 2ae244e

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

CHANGES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ This file contains the changes to the Roundup system over time. The entries
22
are given with the most recent entry first. If no other name is given,
33
Richard Jones did the change.
44

5-
2011-05-13 1.4.17 (r4603)
5+
2011-05-13 1.4.17 (r4605)
66

77
Features:
88

setup.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,15 @@ def main():
9494
# perform the setup action
9595
from roundup import __version__
9696

97+
# long_description may not contain non-ascii characters. Distutils
98+
# will produce an non-installable installer on linux *and* we can't
99+
# run the bdist_wininst on Linux if there are non-ascii characters
100+
# because the distutils installer will try to use the mbcs codec
101+
# which isn't available on non-windows platforms. See also
102+
# http://bugs.python.org/issue10945
97103
long_description=open('doc/announcement.txt').read().decode('utf8')
98104
try:
99-
long_description.encode('ascii')
105+
long_description = long_description.encode('ascii')
100106
except UnicodeEncodeError, cause:
101107
print >> sys.stderr, "doc/announcement.txt contains non-ascii: %s" \
102108
% cause

0 commit comments

Comments
 (0)