Skip to content

Commit 3976a5f

Browse files
author
Ralf Schlatterbeck
committed
test that announcement.txt is pure ASCII...
...required at least up to python2.5 by distutils. (Note tht doc/announcement.txt is the *old* announcement from the last release, I've changed it so that setup.py will work for now and to illustrate what needed to be changed).
1 parent 91a8ac2 commit 3976a5f

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

doc/announcement.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Fixed:
2222

2323
- fixed reporting of source missing warnings
2424
- relevant tests made locale independent, issue2550660 (thanks
25-
Benni Bärmann for reporting).
25+
Benni Baermann for reporting).
2626
- fix for incorrect except: syntax, issue2550661 (thanks Jakub Wilk)
2727
- No longer use the root logger, use a logger with prefix "roundup",
2828
see http://thread.gmane.org/gmane.comp.bug-tracking.roundup.devel/5356
@@ -38,7 +38,7 @@ Fixed:
3838
which roundup interprets as a Reject exception. Fixes issue2550667.
3939
Added regression tests for message/rfc822 attachments with and without
4040
configured unpacking (mailgw unpack_rfc822, see Features above)
41-
Thanks to Benni Bärmann for reporting.
41+
Thanks to Benni Baermann for reporting.
4242
- Allow search_popup macro to work with all db classes, issue2550567
4343
(thanks John Kristensen)
4444
- lower memory footprint for (journal-) import

setup.py

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

97+
long_description=open('doc/announcement.txt').read().decode('utf8')
98+
try:
99+
long_description.encode('ascii')
100+
except UnicodeEncodeError, cause:
101+
print >> sys.stderr, "doc/announcement.txt contains non-ascii: %s" \
102+
% cause
103+
sys.exit(42)
104+
97105
setup(name='roundup',
98106
version=__version__,
99107
author="Richard Jones",
100108
author_email="[email protected]",
101109
description="A simple-to-use and -install issue-tracking system"
102110
" with command-line, web and e-mail interfaces. Highly"
103111
" customisable.",
104-
long_description=open('doc/announcement.txt').read().decode('utf8'),
112+
long_description=long_description,
105113
url='http://www.roundup-tracker.org',
106114
download_url='http://pypi.python.org/pypi/roundup',
107115
classifiers=['Development Status :: 5 - Production/Stable',

0 commit comments

Comments
 (0)