Mercurial > p > roundup > code
annotate test/test_mailer.py @ 5414:3fa026621f69
Python 3 preparation: comparisons.
Python 3 no longer has the cmp function, or cmp= arguments to sorting
functions / methods (key= must be used instead), and requires rich
comparison methods such as __lt__ to be defined instead of using
__cmp__. All of the comparison mechanisms supported in Python 3 are
also supported in Python 2.
This patch makes the corresponding changes in Roundup to use key
functions and rich comparison methods. In the case of the
JournalPassword and Permission classes, only __eq__ and __ne__ are
defined as I don't see ordered comparisons as useful there (and for
Permission, the old __cmp__ function didn't try to provide a valid
ordering). In the case of the Date class, I kept the __cmp__ method
and implemented the others in terms of it, to avoid excess
repetitiveness in duplicating implementation code for all six rich
comparison methods.
In roundup/admin.py, help_commands_html used operator.attrgetter to
produce the second argument of sorted() - which would be reasonable
for a key function, but the second argument is the cmp function in
Python 2, not a key function (and the key function must be a named
argument not a positional argument in Python 3). That function
appears to be completely unused, so I expect that code never worked.
This patch adds the missing key= to that sorted() call, but it would
also be reasonable to remove the unused function completely instead.
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Wed, 25 Jul 2018 00:39:37 +0000 |
| parents | 198b6e810c67 |
| children | bc2e682e0305 |
| rev | line source |
|---|---|
|
5248
198b6e810c67
Use Python-3-compatible 'as' syntax for except statements
Eric S. Raymond <esr@thyrsus.com>
parents:
5037
diff
changeset
|
1 #-*- encoding: utf-8 -*- |
|
4338
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2 import unittest |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3 |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
4 from roundup import mailer |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
5 |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
6 class EncodingTestCase(unittest.TestCase): |
|
4520
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
7 def testEncoding(self): |
|
4338
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
8 a = lambda n, a, c, o: self.assertEquals(mailer.nice_sender_header(n, |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
9 a, c), o) |
|
4520
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
10 a('ascii', 'ascii@test.com', 'iso8859-1', 'ascii <ascii@test.com>') |
|
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
11 a(u'café', 'ascii@test.com', 'iso8859-1', |
|
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
12 '=?iso8859-1?q?caf=E9?= <ascii@test.com>') |
|
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
13 a('as"ii', 'ascii@test.com', 'iso8859-1', '"as\\"ii" <ascii@test.com>') |
|
4338
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
14 |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
15 # vim: set et sts=4 sw=4 : |
