diff --git a/beat/web/libraries/tests/tests_api.py b/beat/web/libraries/tests/tests_api.py index 3d1a817c5d03595f34053c42489f4451c02980b4..b97d1230c7a99e0ef934dcd7ceda2981077a0a26 100644 --- a/beat/web/libraries/tests/tests_api.py +++ b/beat/web/libraries/tests/tests_api.py @@ -59,13 +59,13 @@ class LibrariesListRetrieval(LibrariesAPIBase): self.assertEqual(library['short_description'], '') self.assertTrue(library['fork_of'] is None) self.assertEqual(library['accessibility'], 'public') - self.assertFalse(library.has_key('is_owner')) + self.assertFalse('is_owner' in library) library = filter(lambda x: x['name'] == 'jackdoe/usable_by_all/1', content)[0] self.assertEqual(library['short_description'], '') self.assertTrue(library['fork_of'] is None) self.assertEqual(library['accessibility'], 'confidential') - self.assertFalse(library.has_key('is_owner')) + self.assertFalse('is_owner' in library) def test_all_accessible_libraries(self): @@ -913,7 +913,7 @@ class LibraryRetrieval(LibrariesAPIBase): self.assertEqual(data['accessibility'], 'public') self.assertTrue(data['opensource']) self.assertEqual(data['description'], '') - self.assertFalse(data.has_key('is_owner')) + self.assertFalse('is_owner' in data) self.assertEqual(data['declaration'], LibrariesAPIBase.JSON_DECLARATION) self.assertEqual(data['code'], LibrariesAPIBase.CODE) @@ -926,8 +926,8 @@ class LibraryRetrieval(LibrariesAPIBase): self.assertEqual(data['accessibility'], 'confidential') self.assertFalse(data['opensource']) self.assertEqual(data['description'], '') - self.assertFalse(data.has_key('code')) - self.assertFalse(data.has_key('is_owner')) + self.assertFalse('code' in data) + self.assertFalse('is_owner' in data) def test_successful_retrieval_of_public_library(self): @@ -957,7 +957,7 @@ class LibraryRetrieval(LibrariesAPIBase): self.assertEqual(data['accessibility'], 'confidential') self.assertFalse(data['opensource']) self.assertEqual(data['description'], '') - self.assertFalse(data.has_key('code')) + self.assertFalse('code' in data) def test_successful_retrieval_of_publicly_usable_library(self): @@ -971,7 +971,7 @@ class LibraryRetrieval(LibrariesAPIBase): self.assertEqual(data['accessibility'], 'confidential') self.assertFalse(data['opensource']) self.assertEqual(data['description'], '') - self.assertFalse(data.has_key('code')) + self.assertFalse('code' in data) def test_successful_retrieval_of_confidential_library(self): @@ -1007,8 +1007,8 @@ class LibraryRetrieval(LibrariesAPIBase): self.assertTrue(isinstance(data['sharing'], dict)) self.assertEqual(data['sharing']['status'], 'public') - self.assertFalse(data['sharing'].has_key('public_users')) - self.assertFalse(data['sharing'].has_key('usable_users')) + self.assertFalse('public_users' in data['sharing']) + self.assertFalse('usable_users' in data['sharing']) def test_successful_retrieval_of_own_confidential_library(self): @@ -1049,8 +1049,8 @@ class LibraryRetrieval(LibrariesAPIBase): self.assertTrue(isinstance(data['sharing'], dict)) self.assertEqual(data['sharing']['status'], 'usable') - self.assertFalse(data['sharing'].has_key('shared_with')) - self.assertFalse(data['sharing'].has_key('usable_users')) + self.assertFalse('shared_with' in data['sharing']) + self.assertFalse('usable_users' in data['sharing']) def test_successful_retrieval_of_own_shared_library(self): @@ -1071,7 +1071,7 @@ class LibraryRetrieval(LibrariesAPIBase): self.assertTrue(isinstance(data['sharing'], dict)) self.assertEqual(data['sharing']['status'], 'shared') self.assertEqual(data['sharing']['shared_with'], ['johndoe']) - self.assertFalse(data['sharing'].has_key('usable_by')) + self.assertFalse('usable_by' in data['sharing']) @@ -1121,7 +1121,7 @@ class LibrarySharingAPIBase(LibrariesAPIBase): self.assertEqual(len(sharing_preferences.keys()), len(reference.keys())) for (key, value) in reference.items(): - self.assertTrue(sharing_preferences.has_key(key)) + self.assertTrue(key in sharing_preferences) if isinstance(value, list): self.assertEqual(len(sharing_preferences[key]), len(value))