From ee90c55b1388947872c60b538e2704d605e528df Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 16 Mar 2012 02:19:45 -0400 Subject: [PATCH] squash warnings under py3 --- repoze/sendmail/tests/test_delivery.py | 46 +++++++++++++------------- repoze/sendmail/tests/test_encoding.py | 11 ++++-- repoze/sendmail/tests/test_maildir.py | 24 +++++++------- repoze/sendmail/tests/test_queue.py | 18 +++++----- 4 files changed, 53 insertions(+), 46 deletions(-) diff --git a/repoze/sendmail/tests/test_delivery.py b/repoze/sendmail/tests/test_delivery.py index f78e485..1cfce23 100644 --- a/repoze/sendmail/tests/test_delivery.py +++ b/repoze/sendmail/tests/test_delivery.py @@ -78,30 +78,30 @@ def testSend(self): message.set_payload('This is just an example\n') msgid = delivery.send(fromaddr, toaddrs, message) - self.assertEquals(msgid, '<20030519.1234@example.org>') - self.assertEquals(mailer.sent_messages, []) + self.assertEqual(msgid, '<20030519.1234@example.org>') + self.assertEqual(mailer.sent_messages, []) transaction.commit() - self.assertEquals(mailer.sent_messages, + self.assertEqual(mailer.sent_messages, [(fromaddr, toaddrs, message)]) mailer.sent_messages = [] msgid = delivery.send(fromaddr, toaddrs, message) self.assertTrue('@' in msgid) - self.assertEquals(mailer.sent_messages, []) + self.assertEqual(mailer.sent_messages, []) transaction.commit() - self.assertEquals(len(mailer.sent_messages), 1) - self.assertEquals(mailer.sent_messages[0][0], fromaddr) - self.assertEquals(mailer.sent_messages[0][1], toaddrs) - self.assertEquals(mailer.sent_messages[0][2].get_payload(), + self.assertEqual(len(mailer.sent_messages), 1) + self.assertEqual(mailer.sent_messages[0][0], fromaddr) + self.assertEqual(mailer.sent_messages[0][1], toaddrs) + self.assertEqual(mailer.sent_messages[0][2].get_payload(), 'This is just an example\n') self.assertEqual(message['Message-Id'], msgid) self.assertEqual(message['Message-Id'], ext_msgid) mailer.sent_messages = [] msgid = delivery.send(fromaddr, toaddrs, message) - self.assertEquals(mailer.sent_messages, []) + self.assertEqual(mailer.sent_messages, []) transaction.abort() - self.assertEquals(mailer.sent_messages, []) + self.assertEqual(mailer.sent_messages, []) def testMakeMessageId(self): from repoze.sendmail.delivery import DirectMailDelivery @@ -194,12 +194,12 @@ def testSend(self): message.set_payload('This is just an example\n') msgid = delivery.send(fromaddr, toaddrs, message) - self.assertEquals(msgid, '<20030519.1234@example.org>') - self.assertEquals(MaildirMessageStub.commited_messages, []) - self.assertEquals(MaildirMessageStub.aborted_messages, []) + self.assertEqual(msgid, '<20030519.1234@example.org>') + self.assertEqual(MaildirMessageStub.commited_messages, []) + self.assertEqual(MaildirMessageStub.aborted_messages, []) transaction.commit() - self.assertEquals(len(MaildirMessageStub.commited_messages), 1) - self.assertEquals(MaildirMessageStub.aborted_messages, []) + self.assertEqual(len(MaildirMessageStub.commited_messages), 1) + self.assertEqual(MaildirMessageStub.aborted_messages, []) message = MaildirMessageStub.commited_messages[0] self.assertEqual(raw_header(message['X-Actually-From']), fromaddr) self.assertEqual(raw_header( @@ -208,23 +208,23 @@ def testSend(self): MaildirMessageStub.commited_messages = [] msgid = delivery.send(fromaddr, toaddrs, message) self.assertTrue('@' in msgid) - self.assertEquals(MaildirMessageStub.commited_messages, []) - self.assertEquals(MaildirMessageStub.aborted_messages, []) + self.assertEqual(MaildirMessageStub.commited_messages, []) + self.assertEqual(MaildirMessageStub.aborted_messages, []) transaction.commit() - self.assertEquals(len(MaildirMessageStub.commited_messages), 1) + self.assertEqual(len(MaildirMessageStub.commited_messages), 1) self.assertEqual(MaildirMessageStub.commited_messages[0].get_payload(), 'This is just an example\n') self.assertEqual(message['Message-Id'], msgid) self.assertEqual(message['Message-Id'], ext_msgid) - self.assertEquals(MaildirMessageStub.aborted_messages, []) + self.assertEqual(MaildirMessageStub.aborted_messages, []) MaildirMessageStub.commited_messages = [] msgid = delivery.send(fromaddr, toaddrs, message) - self.assertEquals(MaildirMessageStub.commited_messages, []) - self.assertEquals(MaildirMessageStub.aborted_messages, []) + self.assertEqual(MaildirMessageStub.commited_messages, []) + self.assertEqual(MaildirMessageStub.aborted_messages, []) transaction.abort() - self.assertEquals(MaildirMessageStub.commited_messages, []) - self.assertEquals(len(MaildirMessageStub.aborted_messages), 1) + self.assertEqual(MaildirMessageStub.commited_messages, []) + self.assertEqual(len(MaildirMessageStub.aborted_messages), 1) def testNonASCIIAddrs(self): from email.message import Message diff --git a/repoze/sendmail/tests/test_encoding.py b/repoze/sendmail/tests/test_encoding.py index c013bec..dcb23c9 100644 --- a/repoze/sendmail/tests/test_encoding.py +++ b/repoze/sendmail/tests/test_encoding.py @@ -15,6 +15,8 @@ import unittest import base64 import quopri +import sys + from email import message from email.mime import multipart from email.mime import application @@ -33,6 +35,11 @@ def b(x): return codecs.latin_1_encode(x)[0] # BBB Python 2 and 3 compat from urllib import quote +if sys.version_info[0] == 3: + encodestring = base64.encodebytes +else: + encodestring = base64.encodestring + class TestEncoding(unittest.TestCase): @@ -179,7 +186,7 @@ def test_encoding_utf_8_body(self): encoded = self.encode() - self.assertTrue(base64.encodestring(body.encode('utf_8')) in encoded) + self.assertTrue(encodestring(body.encode('utf_8')) in encoded) def test_binary_body(self): body = b('I know what you did last PyCon') @@ -188,4 +195,4 @@ def test_binary_body(self): encoded = self.encode() - self.assertTrue(base64.encodestring(body) in encoded) + self.assertTrue(encodestring(body) in encoded) diff --git a/repoze/sendmail/tests/test_maildir.py b/repoze/sendmail/tests/test_maildir.py index d378a09..9a42ba7 100644 --- a/repoze/sendmail/tests/test_maildir.py +++ b/repoze/sendmail/tests/test_maildir.py @@ -191,19 +191,19 @@ def test_factory(self): from repoze.sendmail.maildir import Maildir # Case 1: normal maildir - m = Maildir('/path/to/maildir') + Maildir('/path/to/maildir') # Case 2a: directory does not exist, create = False self.assertRaises(ValueError, Maildir, '/path/to/nosuchfolder', False) # Case 2b: directory does not exist, create = True - m = Maildir('/path/to/nosuchfolder', True) + Maildir('/path/to/nosuchfolder', True) dirs = list(self.fake_os_module._made_directories) dirs.sort() - self.assertEquals(dirs, ['/path/to/nosuchfolder', - '/path/to/nosuchfolder/cur', - '/path/to/nosuchfolder/new', - '/path/to/nosuchfolder/tmp']) + self.assertEqual(dirs, ['/path/to/nosuchfolder', + '/path/to/nosuchfolder/cur', + '/path/to/nosuchfolder/new', + '/path/to/nosuchfolder/tmp']) # Case 3: it is a file, not a directory self.assertRaises(ValueError, Maildir, '/path/to/regularfile', False) @@ -249,11 +249,11 @@ def test_tx_msg_abort(self): filename1 = '/path/to/maildir/tmp/1234500002.4242.myhostname' filename2 = '/path/to/maildir/new/1234500002.4242.myhostname' tx_msg = MaildirTransactionalMessage(filename1, filename2) - self.assertEquals(tx_msg._pending_path, filename1) + self.assertEqual(tx_msg._pending_path, filename1) tx_msg.abort() - self.assertEquals(tx_msg._aborted, True) - self.assertEquals(tx_msg._committed, False) + self.assertEqual(tx_msg._aborted, True) + self.assertEqual(tx_msg._committed, False) self.assertTrue(filename1 in self.fake_os_module._removed_files) tx_msg.abort() @@ -264,11 +264,11 @@ def test_tx_msg_commit(self): filename1 = '/path/to/maildir/tmp/1234500002.4242.myhostname' filename2 = '/path/to/maildir/new/1234500002.4242.myhostname' tx_msg = MaildirTransactionalMessage(filename1, filename2) - self.assertEquals(tx_msg._pending_path, filename1) + self.assertEqual(tx_msg._pending_path, filename1) tx_msg.commit() - self.assertEquals(tx_msg._aborted, False) - self.assertEquals(tx_msg._committed, True) + self.assertEqual(tx_msg._aborted, False) + self.assertEqual(tx_msg._committed, True) self.assertTrue((filename1, filename2) in self.fake_os_module._renamed_files) diff --git a/repoze/sendmail/tests/test_queue.py b/repoze/sendmail/tests/test_queue.py index eaadf5b..b816dfb 100644 --- a/repoze/sendmail/tests/test_queue.py +++ b/repoze/sendmail/tests/test_queue.py @@ -105,7 +105,7 @@ def test_delivery(self): [('foo@example.com', ('bar@example.com', 'baz@example.com'), 'Header: value\n\nBody\n')]) - self.failIf(os.path.exists(self.filename), 'File exists') + self.assertFalse(os.path.exists(self.filename), 'File exists') self.assertEquals(self.qp.log.infos, [('Mail from %s to %s sent.', ('foo@example.com', @@ -154,7 +154,7 @@ def test_smtp_response_error_transient(self): self.qp.send_messages() # File must remail were it was, so it will be retried - self.failUnless(os.path.exists(self.filename)) + self.assertTrue(os.path.exists(self.filename)) self.assertEquals(self.qp.log.errors, [('Error while sending mail from %s to %s.', ('foo@example.com', @@ -174,10 +174,10 @@ def test_smtp_response_error_permanent(self): self.qp.send_messages() # File must be moved aside - self.failIf(os.path.exists(self.filename)) - self.failUnless(os.path.exists(os.path.join(self.dir, + self.assertFalse(os.path.exists(self.filename)) + self.assertTrue(os.path.exists(os.path.join(self.dir, '.rejected-message'))) - self.assertEquals(self.qp.log.errors, + self.assertEqual(self.qp.log.errors, [('Discarding email from %s to %s due to a ' 'permanent error: %s', ('foo@example.com', @@ -205,7 +205,7 @@ def test_concurrent_delivery(self): self.qp.send_messages() self.assertEquals(self.qp.mailer.sent_messages, []) - self.failUnless(os.path.exists(self.filename), + self.assertTrue(os.path.exists(self.filename), 'File does not exist') self.assertEquals(self.qp.log.infos, []) finally: @@ -235,14 +235,14 @@ def test_concurrent_delivery_w_old_file(self): [('foo@example.com', ('bar@example.com', 'baz@example.com'), 'Header: value\n\nBody\n')]) - self.failIf(os.path.exists(self.filename), - 'File still exists') + self.assertFalse(os.path.exists(self.filename), + 'File still exists') self.assertEquals(self.qp.log.infos, [('Mail from %s to %s sent.', ('foo@example.com', 'bar@example.com, baz@example.com'), {})]) - self.failIf(os.path.exists(tmp_filename)) + self.assertFalse(os.path.exists(tmp_filename)) class TestConsoleApp(TestCase): def setUp(self):