/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_mail_client.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 10:56:06 UTC
  • mto: This revision was merged to the branch mainline in revision 7030.
  • Revision ID: jelmer@jelmer.uk-20180708105606-d53hkks89qq88twu
Use separate .as_bytes method rather than __bytes__.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_mail_client.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
import urllib
18
 
 
19
 
from bzrlib import (
 
17
from .. import (
20
18
    errors,
21
19
    mail_client,
22
20
    tests,
23
21
    urlutils,
24
22
    osutils,
25
23
    )
 
24
from ..sixish import text_type
 
25
 
26
26
 
27
27
class TestMutt(tests.TestCase):
28
28
 
45
45
            ['-s', 'Hi there!', '-a', 'file%', '--', 'jrandom@example.org'],
46
46
            cmdline)
47
47
        for item in cmdline:
48
 
            self.assertFalse(isinstance(item, unicode),
 
48
            self.assertFalse(isinstance(item, text_type),
49
49
                'Command-line item %r is unicode!' % item)
50
50
 
51
51
 
75
75
            "subject='Hi there!',to='jrandom@example.org'",
76
76
            ], cmdline)
77
77
        for item in cmdline:
78
 
            self.assertFalse(isinstance(item, unicode),
 
78
            self.assertFalse(isinstance(item, text_type),
79
79
                'Command-line item %r is unicode!' % item)
80
80
 
81
81
 
112
112
        if eclient.elisp_tmp_file is not None:
113
113
            self.addCleanup(osutils.delete_any, eclient.elisp_tmp_file)
114
114
        for item in commandline:
115
 
            self.assertFalse(isinstance(item, unicode),
 
115
            self.assertFalse(isinstance(item, text_type),
116
116
                'Command-line item %r is unicode!' % item)
117
117
 
118
118
 
120
120
 
121
121
    def test_commandline(self):
122
122
        xdg_email = mail_client.XDGEmail(None)
123
 
        self.assertRaises(errors.NoMailAddressSpecified,
 
123
        self.assertRaises(mail_client.NoMailAddressSpecified,
124
124
                          xdg_email._get_compose_commandline,
125
125
                          None, None, 'file%')
126
126
        commandline = xdg_email._get_compose_commandline(
141
141
             '--attach', 'file%'],
142
142
            cmdline)
143
143
        for item in cmdline:
144
 
            self.assertFalse(isinstance(item, unicode),
 
144
            self.assertFalse(isinstance(item, text_type),
145
145
                'Command-line item %r is unicode!' % item)
146
146
 
147
147
 
165
165
            ],
166
166
            cmdline)
167
167
        for item in cmdline:
168
 
            self.assertFalse(isinstance(item, unicode),
 
168
            self.assertFalse(isinstance(item, text_type),
169
169
                'Command-line item %r is unicode!' % item)
170
170
 
171
171
 
188
188
            ['-s', 'Hi there!', '--attach', 'file%', 'jrandom@example.org'],
189
189
            cmdline)
190
190
        for item in cmdline:
191
 
            self.assertFalse(isinstance(item, unicode),
 
191
            self.assertFalse(isinstance(item, text_type),
192
192
                'Command-line item %r is unicode!' % item)
193
193
 
194
194
 
212
212
        claws = mail_client.Claws(None)
213
213
        cmdline = claws._get_compose_commandline(
214
214
            u'jrandom@example.org', u'\xb5cosm of fun!', u'file%')
215
 
        subject_string = urllib.quote(
 
215
        subject_string = urlutils.quote(
216
216
            u'\xb5cosm of fun!'.encode(osutils.get_user_encoding(), 'replace'))
217
217
        self.assertEqual(
218
218
            ['--compose',
221
221
             'file%'],
222
222
            cmdline)
223
223
        for item in cmdline:
224
 
            self.assertFalse(isinstance(item, unicode),
 
224
            self.assertFalse(isinstance(item, text_type),
225
225
                'Command-line item %r is unicode!' % item)
226
226
 
227
227
    def test_with_from(self):
235
235
 
236
236
    def test_to_required(self):
237
237
        claws = mail_client.Claws(None)
238
 
        self.assertRaises(errors.NoMailAddressSpecified,
 
238
        self.assertRaises(mail_client.NoMailAddressSpecified,
239
239
                          claws._get_compose_commandline,
240
240
                          None, None, 'file%')
241
241