IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change the following to replace Python 2 code with Python 3:

Browse Source 
1) Replace the deprecated unit test method.
2) Wraps filter usage in a list call.
3) Converts the old metaclass syntax to new.
4) Use range instead of xrange method.
5) Change Unicode to str.
6) Several other transformations.
7) Fixed change password test cases.
8) Use simplejson instead of plain JSON.
This commit is contained in:
Cyril Jouve
2020-08-31 16:45:31 +05:30
committed by Akshay Joshi
parent 11d5613866
commit 5a253f9053
385 changed files with 938 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/tools/search_objects/tests/test_api_search.py
View File

@@ -37,7 +37,7 @@ class SearchObjectsApiSearch(BaseTestGenerator):
url_params = urlencode(url_params)
response = self.tester.get(self.base_url + '?' + url_params)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
def runTest(self):
database_info = parent_node_dict["database"][-1]
@@ -61,7 +61,7 @@ class SearchObjectsApiSearch(BaseTestGenerator):
types_url = '/search_objects/types/' +\
str(server_id) + '/' + str(db_id)
response = self.tester.get(types_url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
types_data = json.loads(response.data.decode('utf-8'))['data']
for a_type in types_data:

4
web/pgadmin/tools/search_objects/tests/test_api_types.py
View File

@@ -36,11 +36,11 @@ class SearchObjectsApiTypes(BaseTestGenerator):
url = self.url + '/' + str(server_id) + '/' + str(db_id)
response = self.tester.get(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
# repsonse data should be dict
response_data = json.loads(response.data.decode('utf-8'))['data']
self.assertEquals(type(response_data), dict)
self.assertEqual(type(response_data), dict)
# response data key values should not be None
for key, value in response_data.items():

20
web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py
View File

@@ -104,17 +104,17 @@ class SearchObjectsHelperTest(BaseTestGenerator):
# test template path
manager.server_type = 'pg'
manager.version = 906000
self.assertEquals(so_obj.get_template_path(),
'search_objects/sql/pg/#906000#')
self.assertEqual(so_obj.get_template_path(),
'search_objects/sql/pg/#906000#')
self.assertEquals(so_obj.get_show_node_prefs(),
self.expected_show_node_prefs)
self.assertEqual(so_obj.get_show_node_prefs(),
self.expected_show_node_prefs)
self.assertEquals(so_obj.get_supported_types(),
self.expected_supported_types)
self.assertEqual(so_obj.get_supported_types(),
self.expected_supported_types)
self.assertEquals(so_obj.get_supported_types(skip_check=True),
self.expected_supported_types_skip)
self.assertEqual(so_obj.get_supported_types(skip_check=True),
self.expected_supported_types_skip)
self.assertEquals(so_obj.search('searchtext', 'all'),
self.expected_search_op)
self.assertEqual(so_obj.search('searchtext', 'all'),
self.expected_search_op)