From ce16c840a94d52e99397672eeba8b9887f424895 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Sat, 7 Feb 2015 14:16:01 +0100 Subject: [PATCH] ReadOnlyDictView: Fix python3 issues, ditch the has_key method --- tasklib/task.py | 3 --- tasklib/tests.py | 15 ++++----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/tasklib/task.py b/tasklib/task.py index 537c792..7b512c5 100644 --- 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 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()] diff --git a/tasklib/tests.py b/tasklib/tests.py index 0dae79e..bc2885a 100644 --- 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) - 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 +773,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) -- 2.39.5