Mercurial > p > roundup > code
changeset 4495:53e438d1ca19 1.4.17
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)
| author | Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net> |
|---|---|
| date | Fri, 13 May 2011 09:15:46 +0000 |
| parents | 41ea7d838c82 |
| children | e76576b52f2d |
| files | CHANGES.txt setup.py |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGES.txt Fri May 13 07:56:45 2011 +0000 +++ b/CHANGES.txt Fri May 13 09:15:46 2011 +0000 @@ -2,7 +2,7 @@ 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:
--- a/setup.py Fri May 13 07:56:45 2011 +0000 +++ b/setup.py Fri May 13 09:15:46 2011 +0000 @@ -94,9 +94,15 @@ # 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