SerializingObject: Detect string type using six properly

[etc/taskwarrior.git] / tasklib / tests.py

diff --git a/tasklib/tests.py b/tasklib/tests.py
index 0dae79e53a3b5564ca45c9604268266a62f0f539..5ebea1375aaeb682f845104f50f6d6fae369c449 100644 (file)
--- a/tasklib/tests.py
+++ b/tasklib/tests.py
@@ -502,12 +502,8 @@ class TaskTest(TasklibTest):
         # Test that any normalizer can handle None as a valid value
         t = Task(self.tw)
 
-        # These normalizers are not supposed to handle None
-        exempt_normalizers = ('normalize_uuid', )
-
         normalizers = [getattr(t, normalizer_name) for normalizer_name in
-                       filter(lambda x: x.startswith('normalize_'), dir(t))
-                       if normalizer_name not in exempt_normalizers]
+                       filter(lambda x: x.startswith('normalize_'), dir(t))]
 
         for normalizer in normalizers:
             normalizer(None)
@@ -762,17 +758,9 @@ class ReadOnlyDictViewTest(unittest.TestCase):
         # Assert that viewed dict is not changed
         self.assertEqual(self.sample, self.original_sample)
 
-    def test_readonlydictview_contains(self):
-        self.assertEqual(self.view.has_key('l'), self.sample.has_key('l'))
-        self.assertEqual(self.view.has_key('k'), self.sample.has_key('k'))
-        self.assertEqual(self.view.has_key('d'), self.sample.has_key('d'))
-
-        # Assert that viewed dict is not changed
-        self.assertEqual(self.sample, self.original_sample)
-
     def test_readonlydict_items(self):
         view_items = self.view.items()
-        sample_items = self.sample.items()
+        sample_items = list(self.sample.items())
         self.assertEqual(view_items, sample_items)
 
         view_items.append('newkey')
@@ -781,10 +769,11 @@ class ReadOnlyDictViewTest(unittest.TestCase):
 
     def test_readonlydict_values(self):
         view_values = self.view.values()
-        sample_values = self.sample.values()
+        sample_values = list(self.sample.values())
         self.assertEqual(view_values, sample_values)
 
-        view_list_item = filter(lambda x: type(x) is list, view_values)[0]
+        view_list_item = list(filter(lambda x: type(x) is list,
+                                     view_values))[0]
         view_list_item.append(4)
         self.assertNotEqual(view_values, sample_values)
         self.assertEqual(self.sample, self.original_sample)