← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_email_message.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 18:09:18 UTC
  • mfrom: (6614.1.3 assert)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201180918-jqtq8ol6gdbbbtpv
Fix deprecated assertions to unblock release

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_email_message.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2011, 2014, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
187
187
 
188
188
        address = u'Pepe P\xe9rez <pperez@ejemplo.com>' # unicode ok
189
189
        encoded = EmailMessage.address_to_encoded_header(address)
190
 
        self.assert_('pperez@ejemplo.com' in encoded) # addr must be unencoded
191
 
        self.assertEquals(address, decode(encoded))
 
190
        self.assertTrue('pperez@ejemplo.com' in encoded) # addr must be unencoded
 
191
        self.assertEqual(address, decode(encoded))
192
192
 
193
193
        address = 'Pepe P\xc3\xa9red <pperez@ejemplo.com>' # UTF-8 ok
194
194
        encoded = EmailMessage.address_to_encoded_header(address)
195
 
        self.assert_('pperez@ejemplo.com' in encoded)
196
 
        self.assertEquals(address, decode(encoded).encode('utf-8'))
 
195
        self.assertTrue('pperez@ejemplo.com' in encoded)
 
196
        self.assertEqual(address, decode(encoded).encode('utf-8'))
197
197
 
198
198
        address = 'Pepe P\xe9rez <pperez@ejemplo.com>' # ISO-8859-1 not ok
199
199
        self.assertRaises(BzrBadParameterNotUnicode,