Ran 2to3 on unittests, same sort of manual fixups as before

tests/test_web/test_user_admin.py

@@ -2,8 +2,6 @@
 
 """Unit tests for the user admin interface."""
 
-from __future__ import absolute_import
-
 import json
 import logging
 
@@ -32,7 +30,7 @@ class UserAdminTest(AbstractPillarTest):
         import pillar.web.users.routes
         import pillar.auth
 
-        user_id = self.create_user(roles=(u'mønkeybütler', ))
+        user_id = self.create_user(roles=('mønkeybütler', ))
         self.create_valid_auth_token(user_id, 'token')
 
         # Try to access the home project, creating it.
@@ -72,7 +70,7 @@ class UserAdminTest(AbstractPillarTest):
         dbuser = get_dbuser()
         self.assertEqual({home_project_gid, self.subscriber_gid, self.demo_gid},
                          set(dbuser['groups']))
-        self.assertEqual({u'subscriber', u'demo', u'mønkeybütler'},
+        self.assertEqual({'subscriber', 'demo', 'mønkeybütler'},
                          set(dbuser['roles']))
 
         # Edit user again, revoking demo role.
@@ -80,5 +78,5 @@ class UserAdminTest(AbstractPillarTest):
         dbuser = get_dbuser()
         self.assertEqual({home_project_gid, self.subscriber_gid},
                          set(dbuser['groups']))
-        self.assertEqual({u'subscriber', u'mønkeybütler'},
+        self.assertEqual({'subscriber', 'mønkeybütler'},
                          set(dbuser['roles']))

tests/test_web/test_utils.py

@@ -1,7 +1,5 @@
 # -*- encoding: utf-8 -*-
 
-from __future__ import absolute_import
-
 import unittest
 import datetime
 
@@ -13,20 +11,20 @@ class IsValidIdTest(unittest.TestCase):
     def test_valid(self):
         # 24-byte hex strings
         self.assertTrue(utils.is_valid_id(24 * 'a'))
-        self.assertTrue(utils.is_valid_id(24 * u'a'))
+        self.assertTrue(utils.is_valid_id(24 * 'a'))
+        self.assertTrue(utils.is_valid_id('deadbeefbeefcacedeadcace'))
         self.assertTrue(utils.is_valid_id('deadbeefbeefcacedeadcace'))
-        self.assertTrue(utils.is_valid_id(u'deadbeefbeefcacedeadcace'))
 
         # 12-byte arbitrary ASCII strings
         self.assertTrue(utils.is_valid_id('DeadBeefCake'))
-        self.assertTrue(utils.is_valid_id(u'DeadBeefCake'))
+        self.assertTrue(utils.is_valid_id('DeadBeefCake'))
 
         # 12-byte str object
         self.assertTrue(utils.is_valid_id('beef€67890'))
 
     def test_bad_length(self):
         self.assertFalse(utils.is_valid_id(23 * 'a'))
-        self.assertFalse(utils.is_valid_id(25 * u'a'))
+        self.assertFalse(utils.is_valid_id(25 * 'a'))
 
     def test_non_string(self):
         self.assertFalse(utils.is_valid_id(None))
@@ -38,7 +36,7 @@ class IsValidIdTest(unittest.TestCase):
         self.assertFalse(utils.is_valid_id('deadbeefbeefcakedeadcake'))
 
         # unicode variant of valid 12-byte str object
-        self.assertFalse(utils.is_valid_id(u'beef€67890'))
+        self.assertFalse(utils.is_valid_id('beef€67890'))
 
 
 class PrettyDateTest(unittest.TestCase):