IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-07-07 04:53:25 -05: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/en_US/conf.py
View File

@ -208,8 +208,8 @@ htmlhelp_basename = 'pgadmin4'
# (source start file, target name, title, author, documentclass
# [howto/manual]).
latex_documents = [
('index', 'pgadmin4.tex', u'pgAdmin 4 Documentation',
u'The pgAdmin Development Team', 'manual'),
('index', 'pgadmin4.tex', 'pgAdmin 4 Documentation',
'The pgAdmin Development Team', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
@ -247,6 +247,6 @@ latex_elements = {
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'pgadmin4', u'pgAdmin 4 Documentation',
[u'The pgAdmin Development Team'], 1)
('index', 'pgadmin4', 'pgAdmin 4 Documentation',
['The pgAdmin Development Team'], 1)
]

2
tools/sql_keywords.py
View File

@ -49,7 +49,7 @@ def get_release_tag(current_url=PG_CURRENT_VERSION_URL,
version_regex=PG_CURRENT_VERSION_REGEX):
resp_text = get_file_from_url(current_url)
version = apply_regex(resp_text, version_regex)
if type(version) == list:
if isinstance(version, list):
version = version[0]
return "REL_" + version.replace(".", "_")

4
web/config.py
View File

@ -204,13 +204,13 @@ APP_VERSION_EXTN = ('.css', '.js', '.html', '.svg', '.png', '.gif', '.ico')
if IS_WIN:
# Use the short path on windows
DATA_DIR = os.path.realpath(
os.path.join(fs_short_path(env('APPDATA')), u"pgAdmin")
os.path.join(fs_short_path(env('APPDATA')), "pgAdmin")
)
else:
if SERVER_MODE:
DATA_DIR = '/var/lib/pgadmin'
else:
DATA_DIR = os.path.realpath(os.path.expanduser(u'~/.pgadmin/'))
DATA_DIR = os.path.realpath(os.path.expanduser('~/.pgadmin/'))
# An optional login banner to show security warnings/disclaimers etc. at
# login and password recovery etc. HTML may be included for basic formatting,

2
web/pgAdmin4.py
View File

@ -81,7 +81,7 @@ config.SETTINGS_SCHEMA_VERSION = SCHEMA_VERSION
if not os.path.isfile(config.SQLITE_PATH):
setup_py = os.path.join(
os.path.dirname(os.path.realpath(u_encode(__file__, fs_encoding))),
u'setup.py'
'setup.py'
)
exec(open(file_quote(setup_py), 'r').read())

15
web/pgadmin/__init__.py
View File

@ -40,10 +40,7 @@ from pgadmin.utils.ajax import internal_server_error
from pgadmin.utils.csrf import pgCSRFProtect
from pgadmin import authenticate
# If script is running under python3, it will not have the xrange function
# defined
winreg = None
xrange = range
if os.name == 'nt':
import winreg
@ -164,7 +161,7 @@ class PgAdmin(Flask):
def register_logout_hook(self, module):
if hasattr(module, 'on_logout') and \
type(getattr(module, 'on_logout')) == MethodType:
isinstance(getattr(module, 'on_logout'), MethodType):
self.logout_hooks.append(module)
@ -312,8 +309,8 @@ def create_app(app_name=None):
# Setup authentication
##########################################################################
app.config['SQLALCHEMY_DATABASE_URI'] = u'sqlite:///{0}?timeout={1}' \
.format(config.SQLITE_PATH.replace(u'\\', u'/'),
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///{0}?timeout={1}' \
.format(config.SQLITE_PATH.replace('\\', '/'),
getattr(config, 'SQLITE_TIMEOUT', 500)
)
@ -506,7 +503,7 @@ def create_app(app_name=None):
"SOFTWARE\\" + server_type + "\\Services", 0,
winreg.KEY_READ | arch_key
)
for i in xrange(0, winreg.QueryInfoKey(root_key)[0]):
for i in range(0, winreg.QueryInfoKey(root_key)[0]):
inst_id = winreg.EnumKey(root_key, i)
inst_key = winreg.OpenKey(root_key, inst_id)
@ -568,8 +565,8 @@ def create_app(app_name=None):
svr_discovery_id = section
description = registry.get(section, 'Description')
data_directory = registry.get(section, 'DataDirectory')
svr_comment = gettext(u"Auto-detected {0} installation "
u"with the data directory at {1}"
svr_comment = gettext("Auto-detected {0} installation "
"with the data directory at {1}"
).format(description, data_directory)
add_server(user_id, servergroup_id, svr_name,
svr_superuser, svr_port, svr_discovery_id,

2
web/pgadmin/about/__init__.py
View File

@ -33,7 +33,7 @@ class AboutModule(PgAdminModule):
module="pgAdmin.About",
callback='about_show',
icon='fa fa-info-circle',
label=gettext(u'About %(appname)s', appname=appname)
label=gettext('About %(appname)s', appname=appname)
)
]
}

2
web/pgadmin/authenticate/ldap.py
View File

@ -189,7 +189,7 @@ class LDAPAuthentication(BaseAuthentication):
# Create the TLS configuration object if required
tls = None
if type(uri) == str:
if isinstance(uri, str):
return False, "LDAP configuration error: Set the proper LDAP URI."
if uri.scheme == 'ldaps' or config.LDAP_USE_STARTTLS:

8
web/pgadmin/browser/__init__.py
View File

@ -62,12 +62,12 @@ BROWSER_STATIC = 'browser.static'
JQUERY_ACIPLUGIN = 'jquery.aciplugin'
BROWSER_INDEX = 'browser.index'
PGADMIN_BROWSER = 'pgAdmin.Browser'
PASS_ERROR_MSG = u'Your password has not been changed.'
SMTP_SOCKET_ERROR = u'SMTP Socket error: {error}\n {pass_error}'.format(
PASS_ERROR_MSG = 'Your password has not been changed.'
SMTP_SOCKET_ERROR = 'SMTP Socket error: {error}\n {pass_error}'.format(
error={}, pass_error=PASS_ERROR_MSG)
SMTP_ERROR = u'SMTP error: {error}\n {pass_error}'.format(
SMTP_ERROR = 'SMTP error: {error}\n {pass_error}'.format(
error={}, pass_error=PASS_ERROR_MSG)
PASS_ERROR = u'Error: {error}\n {pass_error}'.format(
PASS_ERROR = 'Error: {error}\n {pass_error}'.format(
error={}, pass_error=PASS_ERROR_MSG)

12
web/pgadmin/browser/server_groups/__init__.py
View File

@ -177,8 +177,8 @@ class ServerGroupView(NodeView):
)
else:
try:
if u'name' in data:
servergroup.name = data[u'name']
if 'name' in data:
servergroup.name = data['name']
db.session.commit()
except exc.IntegrityError:
db.session.rollback()
@ -230,16 +230,16 @@ class ServerGroupView(NodeView):
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
)
if data[u'name'] != '':
if data['name'] != '':
try:
sg = ServerGroup(
user_id=current_user.id,
name=data[u'name'])
name=data['name'])
db.session.add(sg)
db.session.commit()
data[u'id'] = sg.id
data[u'name'] = sg.name
data['id'] = sg.id
data['name'] = sg.name
return jsonify(
node=self.blueprint.generate_browser_node(

24
web/pgadmin/browser/server_groups/servers/__init__.py
View File

@ -38,10 +38,10 @@ def has_any(data, keys):
"""
Checks any one of the keys present in the data given
"""
if data is None and type(data) != dict:
if data is None and not isinstance(data, dict):
return False
if keys is None and type(keys) != list:
if keys is None and not isinstance(keys, list):
return False
for key in keys:
@ -726,9 +726,9 @@ class ServerNode(PGChildNodeView):
def create(self, gid):
"""Add a server node to the settings database"""
required_args = [
u'name',
u'db',
u'sslmode',
'name',
'db',
'sslmode',
]
data = request.form if request.form else json.loads(
@ -743,10 +743,10 @@ class ServerNode(PGChildNodeView):
# Some fields can be provided with service file so they are optional
if 'service' in data and not data['service']:
required_args.extend([
u'host',
u'port',
u'username',
u'role'
'host',
'port',
'username',
'role'
])
for arg in required_args:
if arg not in data:
@ -786,8 +786,8 @@ class ServerNode(PGChildNodeView):
ssl_mode=data.get('sslmode'),
comment=data.get('comment', None),
role=data.get('role', None),
db_res=','.join(data[u'db_res'])
if u'db_res' in data else None,
db_res=','.join(data['db_res'])
if 'db_res' in data else None,
sslcert=data.get('sslcert', None),
sslkey=data.get('sslkey', None),
sslrootcert=data.get('sslrootcert', None),
@ -851,7 +851,7 @@ class ServerNode(PGChildNodeView):
status=401,
success=0,
errormsg=gettext(
u"Unable to connect to server:\n\n{}"
"Unable to connect to server:\n\n{}"
).format(errmsg)
)
else:

6
web/pgadmin/browser/server_groups/servers/databases/__init__.py
View File

@ -574,7 +574,7 @@ class DatabaseView(PGChildNodeView):
def create(self, gid, sid):
"""Create the database."""
required_args = [
u'name'
'name'
]
data = request.form if request.form else json.loads(
@ -992,7 +992,7 @@ class DatabaseView(PGChildNodeView):
Generates sql for creating new database.
"""
required_args = [
u'name'
'name'
]
for arg in required_args:
@ -1183,7 +1183,7 @@ class DatabaseView(PGChildNodeView):
frmtd_variables = parse_variables_from_db(res1['rows'])
result.update(frmtd_variables)
sql_header = u"-- Database: {0}\n\n-- ".format(result['name'])
sql_header = "-- Database: {0}\n\n-- ".format(result['name'])
sql_header += render_template(
"/".join([self.template_path, self._DELETE_SQL]),

2
web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py
View File

@ -606,7 +606,7 @@ class CastView(PGChildNodeView, SchemaDiffObjectCompare):
data=data, conn=self.conn
)
else:
return u"-- definition incomplete", None
return "-- definition incomplete", None
return sql, data['srctyp'] + "->" + data["trgtyp"]
@check_precondition

4
web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py
View File

@ -121,13 +121,13 @@ def get_database_connection(self):
def assert_status_code(self, response):
act_res = response.status_code
exp_res = self.expected_data["status_code"]
return self.assertEquals(act_res, exp_res)
return self.assertEqual(act_res, exp_res)
def assert_error_message(self, response):
act_res = response.json["errormsg"]
exp_res = self.expected_data["error_msg"]
return self.assertEquals(act_res, exp_res)
return self.assertEqual(act_res, exp_res)
def assert_cast_created(self):

2
web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
View File

@ -746,7 +746,7 @@ class EventTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
if not status:
return internal_server_error(errormsg=db_name)
sql_header = u"-- Event Trigger: {0} on database {1}\n\n-- ".format(
sql_header = "-- Event Trigger: {0} on database {1}\n\n-- ".format(
result['name'], db_name
)

2
web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py
View File

@ -122,7 +122,7 @@ class EventTriggerAddTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database

2
web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py
View File

@ -115,7 +115,7 @@ class EventTriggerDeleteTestCase(BaseTestGenerator):
response = self.delete_event_trigger()
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py
View File

@ -113,7 +113,7 @@ class EventTriggerMultipleDeleteTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py
View File

@ -86,7 +86,7 @@ class EventTriggerDependencyDependentTestCase(BaseTestGenerator):
response = self.get_dependency_dependent()
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def get_dependency_dependent(self):
"""

2
web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py
View File

@ -104,7 +104,7 @@ class EventTriggerFunctionsTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

4
web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py
View File

@ -123,7 +123,7 @@ class EventTriggerGetTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database
@ -228,7 +228,7 @@ class EventTriggerGetNodesAndNodeTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py
View File

@ -115,7 +115,7 @@ class EventTriggerPutTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py
View File

@ -122,7 +122,7 @@ class EventTriggerGetSqlTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py
View File

@ -46,7 +46,7 @@ class ExtensionsAddTestCase(BaseTestGenerator):
self.db_id) + '/',
data=json.dumps(self.data),
content_type='html/json')
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
def tearDown(self):
"""This function disconnect the test database and drop added extension.

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py
View File

@ -52,7 +52,7 @@ class ExtensionsDeleteTestCase(BaseTestGenerator):
str(self.server_id) + '/' + str(self.db_id) +
'/' + str(self.extension_id),
follow_redirects=True)
self.assertEquals(delete_response.status_code, 200)
self.assertEqual(delete_response.status_code, 200)
def tearDown(self):
"""This function disconnect the test database. """

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py
View File

@ -66,7 +66,7 @@ class ExtensionsDeleteMultipleTestCase(BaseTestGenerator):
data=json.dumps(data),
content_type='html/json'
)
self.assertEquals(delete_response.status_code, 200)
self.assertEqual(delete_response.status_code, 200)
def tearDown(self):
"""This function disconnect the test database. """

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py
View File

@ -48,7 +48,7 @@ class ExtensionsGetTestCase(BaseTestGenerator):
self.server_id) + '/' +
str(self.db_id) + '/' + str(self.extension_id),
content_type='html/json')
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
def tearDown(self):
"""This function disconnect the test database and drop added

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py
View File

@ -60,7 +60,7 @@ class ExtensionsPutTestCase(BaseTestGenerator):
'/' + str(self.extension_id),
data=json.dumps(data),
follow_redirects=True)
self.assertEquals(put_response.status_code, 200)
self.assertEqual(put_response.status_code, 200)
def tearDown(self):
"""This function disconnect the test database and drop added

6
web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py
View File

@ -167,7 +167,7 @@ class ExternalTablesView(PGChildNodeView):
result = self.get_external_tables(database_id, sql_statement)
if type(result) is not list:
if not isinstance(result, list):
return result
return make_json_response(
@ -197,10 +197,10 @@ class ExternalTablesView(PGChildNodeView):
)
result = self.get_external_tables(database_id, sql_statement)
if type(result) is not list:
if not isinstance(result, list):
return result
if len(result) == 0:
if not result:
return make_json_response(
data=gettext('Could not find the external table.'),
status=404

3
web/pgadmin/browser/server_groups/servers/databases/external_tables/mapping_utils.py
View File

@ -99,8 +99,7 @@ def format_options(format_type, options):
return options
result_options = tokenize_options(options)
all_keys = list(result_options.keys())
all_keys.sort()
all_keys = sorted(result_options)
if format_type not in ['csv', 'text']:
return ','.join([
'%s = %s' % (key, result_options[key]) for key in all_keys

4
web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py
View File

@ -78,7 +78,7 @@ class TestExternalTablesModule(BaseTestGenerator):
manager.sversion = self.manager['sversion']
manager.server_type = self.manager['server_type']
module = ExternalTablesModule('something')
self.assertEquals(
self.assertEqual(
self.expected_result,
module.backend_supported(manager)
)
@ -96,6 +96,6 @@ class TestExternalTablesModule(BaseTestGenerator):
def __test_template_javascript(self):
module = ExternalTablesModule('something')
self.assertEquals(
self.assertEqual(
self.expected_result,
module.module_use_template_javascript)

4
web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py
View File

@ -340,8 +340,8 @@ class TestExternalTablesView(BaseTestGenerator):
self.manager.connection.assert_called_with(
**self.expected_manager_connection_to_be_called_with
)
self.assertEquals(self.manager, external_tables_view.manager)
self.assertEquals(self.connection, external_tables_view.connection)
self.assertEqual(self.manager, external_tables_view.manager)
self.assertEqual(self.connection, external_tables_view.connection)
@patch('pgadmin.browser.server_groups.servers.databases.external_tables'
'.render_template')

2
web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py
View File

@ -130,7 +130,7 @@ class TestProperties(BaseTestGenerator):
self.fail('No exception was raised')
except PropertiesException as exception:
if hasattr(self, 'expected_raise_exception'):
if type(exception) is self.expected_raise_exception:
if isinstance(exception, self.expected_raise_exception):
if hasattr(self,
'expected_internal_server_error_called_with'):
internal_server_error_mock.assert_called_with(

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py
View File

@ -829,7 +829,7 @@ class ForeignDataWrapperView(PGChildNodeView, SchemaDiffObjectCompare):
)
sql += "\n"
sql_header = u"""-- Foreign Data Wrapper: {0}\n\n""".format(
sql_header = """-- Foreign Data Wrapper: {0}\n\n""".format(
res['rows'][0]['name'])
sql_header += """-- DROP FOREIGN DATA WRAPPER {0}

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py
View File

@ -837,7 +837,7 @@ class ForeignServerView(PGChildNodeView, SchemaDiffObjectCompare):
conn=self.conn)
sql += "\n"
sql_header = u"""-- Foreign Server: {0}
sql_header = """-- Foreign Server: {0}
-- DROP SERVER {0}

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py
View File

@ -101,7 +101,7 @@ class ForeignServerAddTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added foreign

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py
View File

@ -87,7 +87,7 @@ class ForeignServerDeleteTestCase(BaseTestGenerator):
actual_response_code = delete_response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py
View File

@ -90,7 +90,7 @@ class ForeignServerDeleteMultipleTestCase(BaseTestGenerator):
actual_response_code = delete_response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py
View File

@ -79,7 +79,7 @@ class ForeignServerDependentsAndDependencyTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py
View File

@ -104,7 +104,7 @@ class ForeignServerGetTestCase(BaseTestGenerator):
actual_response_code = fsrv_response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added extension

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py
View File

@ -81,7 +81,7 @@ class ForeignServerGetSQLTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py
View File

@ -90,7 +90,7 @@ class ForeignServerGetNodeTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py
View File

@ -91,7 +91,7 @@ class ForeignServerPutTestCase(BaseTestGenerator):
actual_response_code = put_response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added extension

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py
View File

@ -92,7 +92,7 @@ class ForeignServerGetSQLTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py
View File

@ -815,7 +815,7 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare):
conn=self.conn)
sql += "\n"
sql_header = u"""-- User Mapping : {0}
sql_header = """-- User Mapping : {0}
-- DROP USER MAPPING FOR {0} SERVER {1}

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py
View File

@ -109,7 +109,7 @@ class UserMappingAddTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added extension

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py
View File

@ -105,7 +105,7 @@ class UserMappingDeleteTestCase(BaseTestGenerator):
actual_response_code = delete_response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py
View File

@ -90,7 +90,7 @@ class UserMappingDeleteMultipleTestCase(BaseTestGenerator):
actual_response_code = delete_response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_dependent_dependency.py
View File

@ -88,7 +88,7 @@ class UserMappingDependentsAndDependencyTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py
View File

@ -115,7 +115,7 @@ class UserMappingGetTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added extension

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_msql.py
View File

@ -90,7 +90,7 @@ class UserMappingGetMSQLTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_node.py
View File

@ -98,7 +98,7 @@ class UserMappingNodesTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py
View File

@ -100,7 +100,7 @@ class UserMappingPutTestCase(BaseTestGenerator):
actual_response_code = put_response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_sql.py
View File

@ -101,7 +101,7 @@ class UserMappingGetSQLTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added

4
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py
View File

@ -76,8 +76,8 @@ class FDWDAddTestCase(BaseTestGenerator):
del self.data['name']
response = self.create_foreign_data_wrapper()
self.assertEquals(response.status_code,
self.expected_data['status_code'])
self.assertEqual(response.status_code,
self.expected_data["status_code"])
def tearDown(self):
"""This function delete the FDW and disconnect the test database """

4
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py
View File

@ -82,8 +82,8 @@ class FDWDeleteTestCase(BaseTestGenerator):
self.fdw_id = 99999
response = self.delete_fdw()
self.assertEquals(response.status_code,
self.expected_data['status_code'])
self.assertEqual(response.status_code,
self.expected_data["status_code"])
def tearDown(self):
"""This function disconnect the test database and drop added extension

4
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py
View File

@ -73,8 +73,8 @@ class FDWDDeleteMultipleTestCase(BaseTestGenerator):
data = {'ids': self.fdw_ids}
delete_response = self.delete_multiple(data)
self.assertEquals(delete_response.status_code,
self.expected_data['status_code'])
self.assertEqual(delete_response.status_code,
self.expected_data["status_code"])
def tearDown(self):
"""This function disconnect the test database and drop added extension

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py
View File

@ -67,7 +67,7 @@ class FDWDependencyAndDependentTestCase(BaseTestGenerator):
response = self.get_dependency_dependent()
expected_response_code = self.expected_data['status_code']
self.assertEquals(response.status_code, expected_response_code)
self.assertEqual(response.status_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added extension

4
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py
View File

@ -72,8 +72,8 @@ class FDWHandlersTestCase(BaseTestGenerator):
side_effect=[return_value_object]):
response = self.get_handlers_fdw()
self.assertEquals(response.status_code,
self.expected_data['status_code'])
self.assertEqual(response.status_code,
self.expected_data["status_code"])
def tearDown(self):
"""This function disconnect the test database and drop added extension

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py
View File

@ -90,7 +90,7 @@ class FDWDGetTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function delete the FDW and disconnect the test database """

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py
View File

@ -95,7 +95,7 @@ class FDWDNodesTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
"""This function disconnect the test database and drop added extension

4
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py
View File

@ -71,8 +71,8 @@ class FDWValidatorsTestCase(BaseTestGenerator):
side_effect=[return_value_object]):
response = self.get_validators_fdw()
self.assertEquals(response.status_code,
self.expected_data['status_code'])
self.assertEqual(response.status_code,
self.expected_data["status_code"])
def tearDown(self):
"""This function delete the FDW and disconnect the test database """

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py
View File

@ -64,7 +64,7 @@ class FDWDGetMSQLTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database to delete it

4
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py
View File

@ -74,8 +74,8 @@ class FDWDPutTestCase(BaseTestGenerator):
return_value=eval(self.mock_data["return_value"])):
put_response = self.update_fdw()
self.assertEquals(put_response.status_code,
self.expected_data['status_code'])
self.assertEqual(put_response.status_code,
self.expected_data["status_code"])
def tearDown(self):
"""This function delete the FDW and disconnect the test database """

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py
View File

@ -74,7 +74,7 @@ class FDWDGetSQLTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database to delete it

2
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py
View File

@ -72,7 +72,7 @@ class LanguagesAddTestCase(BaseTestGenerator):
response = self.create_language()
actual_status_code = response.status_code
expected_status_code = self.expected_data["status_code"]
self.assertEquals(actual_status_code, expected_status_code)
self.assertEqual(actual_status_code, expected_status_code)
def create_language(self):
"""This function will add language under test database."""

2
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py
View File

@ -63,7 +63,7 @@ class LanguagesDeleteTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_status_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_status_code)
self.assertEqual(actual_response_code, expected_status_code)
def delete_language(self):
"""This function will delete language under test database."""

2
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py
View File

@ -57,7 +57,7 @@ class LanguagesDeleteMultipleTestCase(BaseTestGenerator):
data=json.dumps(data),
content_type='html/json'
)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
def tearDown(self):
"""This function disconnect the test database."""

2
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependency.py
View File

@ -45,7 +45,7 @@ class LanguagesGetDependencyTestCase(BaseTestGenerator):
response = self.get_language_dependency()
actual_response_code = response.status_code
expected_status_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_status_code)
self.assertEqual(actual_response_code, expected_status_code)
def get_language_dependency(self):
"""

2
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependent.py
View File

@ -44,7 +44,7 @@ class LanguagesGetDependentTestCase(BaseTestGenerator):
response = self.get_language_dependency()
actual_response_code = response.status_code
expected_status_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_status_code)
self.assertEqual(actual_response_code, expected_status_code)
def get_language_dependency(self):
"""

4
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py
View File

@ -84,7 +84,7 @@ class LanguagesGetTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_status_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_status_code)
self.assertEqual(actual_response_code, expected_status_code)
def get_language_properties(self):
return self.tester.get("{0}{1}/{2}/{3}/{4}".format(
@ -147,7 +147,7 @@ class LanguagesGetNodesTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_status_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_status_code)
self.assertEqual(actual_response_code, expected_status_code)
def get_language_nodes(self):
return self.tester.get("{0}{1}/{2}/{3}/".format(

2
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get_function_and_template.py
View File

@ -51,7 +51,7 @@ class LanguagesGetFunctionAndTemplateTestCase(BaseTestGenerator):
response = self.get_language_functions_template()
actual_response_code = response.status_code
expected_status_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_status_code)
self.assertEqual(actual_response_code, expected_status_code)
def get_language_functions_template(self):
"""

2
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py
View File

@ -56,7 +56,7 @@ class LanguagesPutTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_status_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_status_code)
self.assertEqual(actual_response_code, expected_status_code)
def update_language(self):

2
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_sql.py
View File

@ -56,7 +56,7 @@ class LanguagesGetSql(BaseTestGenerator):
response = self.get_language_sql()
actual_response_code = response.status_code
expected_status_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_status_code)
self.assertEqual(actual_response_code, expected_status_code)
def get_language_sql(self):
"""

4
web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py
View File

@ -867,7 +867,7 @@ It may have been removed by another user.
_=gettext, data=data, conn=self.conn
)
sql_header = u"-- SCHEMA: {0}\n\n-- ".format(data['name'])
sql_header = "-- SCHEMA: {0}\n\n-- ".format(data['name'])
# drop schema
sql_header += render_template(
@ -1051,7 +1051,7 @@ It may have been removed by another user.
_=gettext, data=old_data, conn=self.conn
)
sql_header = u"""
sql_header = """
-- CATALOG: {0}
-- DROP SCHEMA {0};

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py
View File

@ -716,7 +716,7 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare):
self._CREATE_SQL]),
data=data, conn=self.conn)
sql_header = u"-- Collation: {0};\n\n-- ".format(data['name'])
sql_header = "-- Collation: {0};\n\n-- ".format(data['name'])
sql_header += render_template("/".join([self.template_path,
self._DELETE_SQL]),

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py
View File

@ -103,7 +103,7 @@ class CollationAddTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py
View File

@ -89,7 +89,7 @@ class CollationDeleteTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database to delete it

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py
View File

@ -83,7 +83,7 @@ class CollationDeleteMultipleTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database to delete it

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py
View File

@ -70,7 +70,7 @@ class CollationDependentsTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py
View File

@ -98,7 +98,7 @@ class CollationGetTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database to delete it

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py
View File

@ -78,7 +78,7 @@ class CollationGetTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data["status_code"]
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database to delete it

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py
View File

@ -91,7 +91,7 @@ class CollationNodesTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py
View File

@ -94,7 +94,7 @@ class CollationPutTestCase(BaseTestGenerator):
actual_response_code = put_response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database to delete it

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py
View File

@ -89,7 +89,7 @@ class CollationSqlTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database to delete it

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
View File

@ -753,7 +753,7 @@ AND relkind != 'c'))"""
SQL = render_template("/".join([self.template_path,
self._CREATE_SQL]), data=data)
sql_header = u"""-- DOMAIN: {0}.{1}\n\n""".format(
sql_header = """-- DOMAIN: {0}.{1}\n\n""".format(
data['basensp'], data['name'])
sql_header += """-- DROP DOMAIN {0};\n

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py
View File

@ -610,7 +610,7 @@ class DomainConstraintView(PGChildNodeView):
self._CREATE_SQL]),
data=data, domain=domain, schema=schema)
sql_header = u"""-- CHECK: {1}.{0}
sql_header = """-- CHECK: {1}.{0}
-- ALTER DOMAIN {1} DROP CONSTRAINT {0};

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_add.py
View File

@ -97,7 +97,7 @@ class DomainConstraintAddTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete.py
View File

@ -106,7 +106,7 @@ class DomainConstraintDeleteTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete_multiple.py
View File

@ -108,7 +108,7 @@ class DomainConstraintDeleteMultipleTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect database to delete it

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_dependents.py
View File

@ -100,7 +100,7 @@ class DomainConstraintDependentAndDependencyTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_get.py
View File

@ -128,7 +128,7 @@ class DomainConstraintGetTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_msql.py
View File

@ -107,7 +107,7 @@ class DomainConstraintMsqlTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_node.py
View File

@ -132,7 +132,7 @@ class DomainConstraintNodeAndNodesTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_put.py
View File

@ -109,7 +109,7 @@ class DomainConstraintPutTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_sql.py
View File

@ -111,7 +111,7 @@ class DomainConstraintGetSqlTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py
View File

@ -84,7 +84,7 @@ class DomainAddTestCase(BaseTestGenerator):
expected_response_code = self.expected_data['status_code']
self.assertEquals(response.status_code, expected_response_code)
self.assertEqual(response.status_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py
View File

@ -83,7 +83,7 @@ class DomainDeleteTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py
View File

@ -80,7 +80,7 @@ class DomainDeleteMultipleTestCase(BaseTestGenerator):
actual_response_code = get_response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py
View File

@ -70,7 +70,7 @@ class DomainGetDependentsAndDependencyTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py
View File

@ -98,7 +98,7 @@ class DomainGetTestCase(BaseTestGenerator):
actual_response_code = response.status_code
expected_response_code = self.expected_data['status_code']
self.assertEquals(actual_response_code, expected_response_code)
self.assertEqual(actual_response_code, expected_response_code)
def tearDown(self):
# Disconnect the database

Some files were not shown because too many files have changed in this diff Show More