IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-07-30 08:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

PEP8 fixes. Fixes #3156

Browse Source
This commit is contained in:
Murtuza Zabuawala
2018-02-27 15:38:50 +00:00
committed by Dave Page
parent f5afd5fdb4
commit cca6504d54
12 changed files with 290 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py
+40 -15
View File
@@ -119,7 +119,11 @@ class TablespaceView(PGChildNodeView):
def wrap(*args, **kwargs):
# Here args[0] will hold self & kwargs will hold gid,sid,tsid
self = args[0]
self.manager = get_driver(PG_DEFAULT_DRIVER).connection_manager(kwargs['sid'])
self.manager = get_driver(
PG_DEFAULT_DRIVER
).connection_manager(
kwargs['sid']
)
self.conn = self.manager.connection()
# If DB not connected then return error to browser
@@ -133,7 +137,9 @@ class TablespaceView(PGChildNodeView):
)
)
self.template_path = 'tablespaces/sql/#{0}#'.format(self.manager.version)
self.template_path = 'tablespaces/sql/#{0}#'.format(
self.manager.version
)
current_app.logger.debug(
"Using the template path: %s", self.template_path
)
@@ -173,11 +179,11 @@ class TablespaceView(PGChildNodeView):
return gone(gettext("""Could not find the tablespace."""))
res = self.blueprint.generate_browser_node(
rset['rows'][0]['oid'],
sid,
rset['rows'][0]['name'],
icon="icon-tablespace"
)
rset['rows'][0]['oid'],
sid,
rset['rows'][0]['name'],
icon="icon-tablespace"
)
return make_json_response(
data=res,
@@ -269,7 +275,9 @@ class TablespaceView(PGChildNodeView):
return internal_server_error(errormsg=res)
if len(res['rows']) == 0:
return gone(gettext("""Could not find the tablespace information."""))
return gone(
gettext("""Could not find the tablespace information.""")
)
# Making copy of output for future use
copy_data = dict(res['rows'][0])
@@ -494,11 +502,17 @@ class TablespaceView(PGChildNodeView):
for key in ['spcacl']:
if key in data and data[key] is not None:
if 'added' in data[key]:
data[key]['added'] = parse_priv_to_db(data[key]['added'], self.acl)
data[key]['added'] = parse_priv_to_db(
data[key]['added'], self.acl
)
if 'changed' in data[key]:
data[key]['changed'] = parse_priv_to_db(data[key]['changed'], self.acl)
data[key]['changed'] = parse_priv_to_db(
data[key]['changed'], self.acl
)
if 'deleted' in data[key]:
data[key]['deleted'] = parse_priv_to_db(data[key]['deleted'], self.acl)
data[key]['deleted'] = parse_priv_to_db(
data[key]['deleted'], self.acl
)
# If name is not present with in update data then copy it
# from old data
@@ -689,7 +703,10 @@ class TablespaceView(PGChildNodeView):
}
# Fetching databases with CONNECT privileges status.
query = render_template("/".join([self.template_path, 'dependents.sql']), fetch_database=True)
query = render_template(
"/".join([self.template_path, 'dependents.sql']),
fetch_database=True
)
status, db_result = self.conn.execute_dict(query)
if not status:
current_app.logger.error(db_result)
@@ -726,8 +743,10 @@ class TablespaceView(PGChildNodeView):
current_app.logger.exception(e)
if temp_conn.connected():
query = render_template("/".join([self.template_path, 'dependents.sql']),
fetch_dependents=True, tsid=tsid)
query = render_template(
"/".join([self.template_path, 'dependents.sql']),
fetch_dependents=True, tsid=tsid
)
status, result = temp_conn.execute_dict(query)
if not status:
current_app.logger.error(result)
@@ -763,7 +782,13 @@ class TablespaceView(PGChildNodeView):
else:
continue
dependents.append({'type': type_name, 'name': rel_name, 'field': db_row['datname']})
dependents.append(
{
'type': type_name,
'name': rel_name,
'field': db_row['datname']
}
)
# Release only those connections which we have created above.
if not is_connected:
web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py
+1
View File
@@ -37,6 +37,7 @@ class BackendSupportedTestCase(BaseTestGenerator):
expected_result=False
))
]
class LocalManager:
def __init__(self, properties):
self.sversion = properties['sversion']
web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py
+3 -3
View File
@@ -47,10 +47,10 @@ class TableSpaceAddTestCase(BaseTestGenerator):
table_space_path, db_owner)
self.tablespace_name = data['name']
response = self.tester.post(
self.url + str(utils.SERVER_GROUP) + '/'
+ str(server_id) + '/',
self.url + str(utils.SERVER_GROUP) + '/' + str(server_id) + '/',
data=json.dumps(data),
content_type='html/json')
content_type='html/json'
)
self.assertEquals(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
tablespace_id = response_data['node']['_id']
web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py
+10 -8
View File
@@ -36,9 +36,11 @@ class TableSpaceDeleteTestCase(BaseTestGenerator):
self.server_id = parent_node_dict["server"][-1]["server_id"]
self.tablespace_id = tablespace_utils.create_tablespace(
self.server, self.tablespace_name)
tablespace_dict = {"tablespace_id": self.tablespace_id,
"tablespace_name": self.tablespace_name,
"server_id": self.server_id}
tablespace_dict = {
"tablespace_id": self.tablespace_id,
"tablespace_name": self.tablespace_name,
"server_id": self.server_id
}
utils.write_node_info("tsid", tablespace_dict)
def runTest(self):
@@ -48,10 +50,11 @@ class TableSpaceDeleteTestCase(BaseTestGenerator):
if tablespace_count == 0:
raise Exception("No tablespace(s) to delete!!!")
response = self.tester.delete(self.url + str(utils.SERVER_GROUP)
+ '/' + str(self.server_id) + '/'
+ str(self.tablespace_id),
follow_redirects=True)
response = self.tester.delete(
self.url + str(utils.SERVER_GROUP) +
'/' + str(self.server_id) + '/' + str(self.tablespace_id),
follow_redirects=True
)
self.assertEquals(response.status_code, 200)
delete_response_data = json.loads(response.data.decode('utf-8'))
self.assertEquals(delete_response_data['success'], 1)
@@ -65,4 +68,3 @@ class TableSpaceDeleteTestCase(BaseTestGenerator):
self.server['port'],
self.server['sslmode'])
tablespace_utils.delete_tablespace(connection, self.tablespace_name)
web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py
+6 -4
View File
@@ -50,11 +50,13 @@ class TableSpaceUpdateTestCase(BaseTestGenerator):
data = {
"description": "This is test description.",
"table_space_id": self.tablespace_id
}
}
put_response = self.tester.put(
self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/'
+ str(self.tablespace_id), data=json.dumps(data),
follow_redirects=True)
self.url + str(utils.SERVER_GROUP) +
'/' + str(self.server_id) + '/' + str(self.tablespace_id),
data=json.dumps(data),
follow_redirects=True
)
self.assertEquals(put_response.status_code, 200)
def tearDown(self):