diff --git a/beat/web/dataformats/tests/tests_api.py b/beat/web/dataformats/tests/tests_api.py index af655a55a6322bb782f3cacbdae9b6930cc30540..008b727295cd8280cde244ba7bae54e32d525ddd 100644 --- a/beat/web/dataformats/tests/tests_api.py +++ b/beat/web/dataformats/tests/tests_api.py @@ -58,13 +58,13 @@ class DataFormatsListRetrieval(DataFormatsAPIBase): self.assertEqual(content[0]['short_description'], 'short description 3') self.assertEqual(content[0]['extend'], 'johndoe/format1/1') self.assertEqual(content[0]['accessibility'], 'public') - self.assertFalse(content[0].has_key('is_owner')) + self.assertFalse('is_owner' in content[0]) self.assertEqual(content[1]['name'], 'johndoe/format1/1') self.assertEqual(content[1]['short_description'], 'short description 1') self.assertEqual(content[1]['extend'], None) self.assertEqual(content[1]['accessibility'], 'public') - self.assertFalse(content[1].has_key('is_owner')) + self.assertFalse('is_owner' in content[1]) def test_all_accessible_dataformats(self): @@ -871,9 +871,9 @@ class DataFormatRetrieval(DataFormatsAPIBase): self.assertEqual(data['accessibility'], 'public') self.assertEqual(data['description'], 'long description 3') self.assertTrue(isinstance(data['declaration'], dict)) - self.assertFalse(data.has_key('is_owner')) + self.assertFalse('is_owner' in data) - self.assertFalse(data.has_key('sharing')) + self.assertFalse('sharing' in data) def test_successful_retrieval_of_public_format(self): @@ -888,7 +888,7 @@ class DataFormatRetrieval(DataFormatsAPIBase): self.assertEqual(data['description'], 'long description 3') self.assertTrue(isinstance(data['declaration'], dict)) - self.assertFalse(data.has_key('sharing')) + self.assertFalse('sharing' in data) def test_successful_retrieval_of_confidential_format(self): @@ -903,7 +903,7 @@ class DataFormatRetrieval(DataFormatsAPIBase): self.assertEqual(data['short_description'], 'short description 5') self.assertTrue(isinstance(data['declaration'], dict)) - self.assertFalse(data.has_key('sharing')) + self.assertFalse('sharing' in data) def test_successful_retrieval_of_own_public_format(self): @@ -920,7 +920,7 @@ class DataFormatRetrieval(DataFormatsAPIBase): self.assertTrue(isinstance(data['sharing'], dict)) self.assertEqual(data['sharing']['status'], 'public') - self.assertFalse(data['sharing'].has_key('shared_with')) + self.assertFalse('shared_with' in data['sharing']) def test_successful_retrieval_of_own_private_format(self):