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)

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4605 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/CHANGES.txt b/CHANGES.txt
index 6f36bf9f9c148dd132de4508719ffaf18c012882..f770f7fb6e8cad204e47c322c34cb81c2afa6b64 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,7 @@ This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first. If no other name is given,
 Richard Jones did the change.
 
-2011-05-13 1.4.17 (r4603)
+2011-05-13 1.4.17 (r4605)
 
 Features:
 

diff --git a/setup.py b/setup.py
index 3426b80d1671d0098c609a58e5c4fb5091e3741a..1d41f79602f4fd34d0890e4ec5be55cd1420f319 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -94,9 +94,15 @@ def main():
     # perform the setup action
     from roundup import __version__
 
+    # long_description may not contain non-ascii characters. Distutils
+    # will produce an non-installable installer on linux *and* we can't
+    # run the bdist_wininst on Linux if there are non-ascii characters
+    # because the distutils installer will try to use the mbcs codec
+    # which isn't available on non-windows platforms. See also
+    # http://bugs.python.org/issue10945
     long_description=open('doc/announcement.txt').read().decode('utf8')
     try:
-        long_description.encode('ascii')
+        long_description = long_description.encode('ascii')
     except UnicodeEncodeError, cause:
         print >> sys.stderr, "doc/announcement.txt contains non-ascii: %s" \
             % cause