fix account.py

1 files changed, 59 insertions, 59 deletions

diff --git a/tests/account_test.py b/tests/account_test.py
index cfc51bf8..959d4c7c 100644
--- a/tests/account_test.py
+++ b/tests/account_test.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
+
 import unittest
 
 from alot import account
@@ -32,26 +32,26 @@ class TestAccount(unittest.TestCase):
 
     def test_get_address(self):
         """Tests address without aliases."""
-        acct = _AccountTestClass(address=u"foo@example.com")
-        self.assertListEqual(acct.get_addresses(), [u'foo@example.com'])
+        acct = _AccountTestClass(address="foo@example.com")
+        self.assertListEqual(acct.get_addresses(), ['foo@example.com'])
 
     def test_get_address_with_aliases(self):
         """Tests address with aliases."""
-        acct = _AccountTestClass(address=u"foo@example.com",
-                                 aliases=[u'bar@example.com'])
+        acct = _AccountTestClass(address="foo@example.com",
+                                 aliases=['bar@example.com'])
         self.assertListEqual(acct.get_addresses(),
-                             [u'foo@example.com', u'bar@example.com'])
+                             ['foo@example.com', 'bar@example.com'])
 
     def test_deprecated_encrypt_by_default(self):
         """Tests that depreacted values are still accepted."""
-        for each in [u'true', u'yes', u'1']:
-            acct = _AccountTestClass(address=u'foo@example.com',
+        for each in ['true', 'yes', '1']:
+            acct = _AccountTestClass(address='foo@example.com',
                                      encrypt_by_default=each)
-            self.assertEqual(acct.encrypt_by_default, u'all')
-        for each in [u'false', u'no', u'0']:
-            acct = _AccountTestClass(address=u'foo@example.com',
+            self.assertEqual(acct.encrypt_by_default, 'all')
+        for each in ['false', 'no', '0']:
+            acct = _AccountTestClass(address='foo@example.com',
                                      encrypt_by_default=each)
-            self.assertEqual(acct.encrypt_by_default, u'none')
+            self.assertEqual(acct.encrypt_by_default, 'none')
 
 
 class TestAddress(unittest.TestCase):
@@ -67,103 +67,103 @@ class TestAddress(unittest.TestCase):
             account.Address.from_string(b'user@example.com')
 
     def test_from_string(self):
-        addr = account.Address.from_string(u'user@example.com')
-        self.assertEqual(addr.username, u'user')
-        self.assertEqual(addr.domainname, u'example.com')
-
-    def test_unicode(self):
-        addr = account.Address(u'ušer', u'example.com')
-        self.assertEqual(unicode(addr), u'ušer@example.com')
+        addr = account.Address.from_string('user@example.com')
+        self.assertEqual(addr.username, 'user')
+        self.assertEqual(addr.domainname, 'example.com')
 
     def test_str(self):
-        addr = account.Address(u'ušer', u'example.com')
-        self.assertEqual(str(addr), u'ušer@example.com'.encode('utf-8'))
+        addr = account.Address('ušer', 'example.com')
+        self.assertEqual(str(addr), 'ušer@example.com')
+
+    def test_bytes(self):
+        addr = account.Address('ušer', 'example.com')
+        self.assertEqual(bytes(addr), 'ušer@example.com'.encode('utf-8'))
 
     def test_eq_unicode(self):
-        addr = account.Address(u'ušer', u'example.com')
-        self.assertEqual(addr, u'ušer@example.com')
+        addr = account.Address('ušer', 'example.com')
+        self.assertEqual(addr, 'ušer@example.com')
 
     def test_eq_address(self):
-        addr = account.Address(u'ušer', u'example.com')
-        addr2 = account.Address(u'ušer', u'example.com')
+        addr = account.Address('ušer', 'example.com')
+        addr2 = account.Address('ušer', 'example.com')
         self.assertEqual(addr, addr2)
 
     def test_ne_unicode(self):
-        addr = account.Address(u'ušer', u'example.com')
-        self.assertNotEqual(addr, u'user@example.com')
+        addr = account.Address('ušer', 'example.com')
+        self.assertNotEqual(addr, 'user@example.com')
 
     def test_ne_address(self):
-        addr = account.Address(u'ušer', u'example.com')
-        addr2 = account.Address(u'user', u'example.com')
+        addr = account.Address('ušer', 'example.com')
+        addr2 = account.Address('user', 'example.com')
         self.assertNotEqual(addr, addr2)
 
     def test_eq_unicode_case(self):
-        addr = account.Address(u'UŠer', u'example.com')
-        self.assertEqual(addr, u'ušer@example.com')
+        addr = account.Address('UŠer', 'example.com')
+        self.assertEqual(addr, 'ušer@example.com')
 
     def test_ne_unicode_case(self):
-        addr = account.Address(u'ušer', u'example.com')
-        self.assertEqual(addr, u'uŠer@example.com')
+        addr = account.Address('ušer', 'example.com')
+        self.assertEqual(addr, 'uŠer@example.com')
 
     def test_ne_address_case(self):
-        addr = account.Address(u'ušer', u'example.com')
-        addr2 = account.Address(u'uŠer', u'example.com')
+        addr = account.Address('ušer', 'example.com')
+        addr2 = account.Address('uŠer', 'example.com')
         self.assertEqual(addr, addr2)
 
     def test_eq_address_case(self):
-        addr = account.Address(u'UŠer', u'example.com')
-        addr2 = account.Address(u'ušer', u'example.com')
+        addr = account.Address('UŠer', 'example.com')
+        addr2 = account.Address('ušer', 'example.com')
         self.assertEqual(addr, addr2)
 
     def test_eq_unicode_case_sensitive(self):
-        addr = account.Address(u'UŠer', u'example.com', case_sensitive=True)
-        self.assertNotEqual(addr, u'ušer@example.com')
+        addr = account.Address('UŠer', 'example.com', case_sensitive=True)
+        self.assertNotEqual(addr, 'ušer@example.com')
 
     def test_eq_address_case_sensitive(self):
-        addr = account.Address(u'UŠer', u'example.com', case_sensitive=True)
-        addr2 = account.Address(u'ušer', u'example.com')
+        addr = account.Address('UŠer', 'example.com', case_sensitive=True)
+        addr2 = account.Address('ušer', 'example.com')
         self.assertNotEqual(addr, addr2)
 
     def test_eq_str(self):
-        addr = account.Address(u'user', u'example.com', case_sensitive=True)
+        addr = account.Address('user', 'example.com', case_sensitive=True)
         with self.assertRaises(TypeError):
             addr == 1  # pylint: disable=pointless-statement
 
     def test_ne_str(self):
-        addr = account.Address(u'user', u'example.com', case_sensitive=True)
+        addr = account.Address('user', 'example.com', case_sensitive=True)
         with self.assertRaises(TypeError):
             addr != 1  # pylint: disable=pointless-statement
 
     def test_repr(self):
-        addr = account.Address(u'user', u'example.com', case_sensitive=True)
+        addr = account.Address('user', 'example.com', case_sensitive=True)
         self.assertEqual(
             repr(addr),
-            "Address(u'user', u'example.com', case_sensitive=True)")
+            "Address('user', 'example.com', case_sensitive=True)")
 
     def test_domain_name_ne(self):
-        addr = account.Address(u'user', u'example.com')
-        self.assertNotEqual(addr, u'user@example.org')
+        addr = account.Address('user', 'example.com')
+        self.assertNotEqual(addr, 'user@example.org')
 
     def test_domain_name_eq_case(self):
-        addr = account.Address(u'user', u'example.com')
-        self.assertEqual(addr, u'user@Example.com')
+        addr = account.Address('user', 'example.com')
+        self.assertEqual(addr, 'user@Example.com')
 
     def test_domain_name_ne_unicode(self):
-        addr = account.Address(u'user', u'éxample.com')
-        self.assertNotEqual(addr, u'user@example.com')
+        addr = account.Address('user', 'éxample.com')
+        self.assertNotEqual(addr, 'user@example.com')
 
     def test_domain_name_eq_unicode(self):
-        addr = account.Address(u'user', u'éxample.com')
-        self.assertEqual(addr, u'user@Éxample.com')
+        addr = account.Address('user', 'éxample.com')
+        self.assertEqual(addr, 'user@Éxample.com')
 
     def test_domain_name_eq_case_sensitive(self):
-        addr = account.Address(u'user', u'example.com', case_sensitive=True)
-        self.assertEqual(addr, u'user@Example.com')
+        addr = account.Address('user', 'example.com', case_sensitive=True)
+        self.assertEqual(addr, 'user@Example.com')
 
     def test_domain_name_eq_unicode_sensitive(self):
-        addr = account.Address(u'user', u'éxample.com', case_sensitive=True)
-        self.assertEqual(addr, u'user@Éxample.com')
+        addr = account.Address('user', 'éxample.com', case_sensitive=True)
+        self.assertEqual(addr, 'user@Éxample.com')
 
     def test_cmp_empty(self):
-        addr = account.Address(u'user', u'éxample.com')
-        self.assertNotEqual(addr, u'')
+        addr = account.Address('user', 'éxample.com')
+        self.assertNotEqual(addr, '')