ReadOnlyDictView: Fix python3 issues, ditch the has_key method

diff --git a/tasklib/task.py b/tasklib/task.py
index 537c79291363edee5e2dec8679c2873af936fe17..7b512c5f88837603661c9b8220f880a45fefa356 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -52,9 +52,6 @@ class ReadOnlyDictView(object):
     def get(self, key, default=None):
         return copy.deepcopy(self.viewed_dict.get(key, default))
 
     def get(self, key, default=None):
         return copy.deepcopy(self.viewed_dict.get(key, default))
 

-    def has_key(self, key):
-        return self.viewed_dict.has_key(key)
-

     def items(self):
         return [copy.deepcopy(v) for v in self.viewed_dict.items()]
 
     def items(self):
         return [copy.deepcopy(v) for v in self.viewed_dict.items()]
 

diff --git a/tasklib/tests.py b/tasklib/tests.py
index 0dae79e53a3b5564ca45c9604268266a62f0f539..bc2885a1867175defe7c356201d5f6423ce734fe 100644 (file)
--- a/tasklib/tests.py
+++ b/tasklib/tests.py
@@ -762,17 +762,9 @@ class ReadOnlyDictViewTest(unittest.TestCase):
         # Assert that viewed dict is not changed
         self.assertEqual(self.sample, self.original_sample)
 
         # 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()
     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')
         self.assertEqual(view_items, sample_items)
 
         view_items.append('newkey')


@@ -781,10 +773,11 @@ class ReadOnlyDictViewTest(unittest.TestCase):
 
     def test_readonlydict_values(self):
         view_values = self.view.values()
 
     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)
 
         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)
         view_list_item.append(4)
         self.assertNotEqual(view_values, sample_values)
         self.assertEqual(self.sample, self.original_sample)