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

Some clumsy coding related fixes reported by SonarQube.

Browse Source
This commit is contained in:
Aditya Toshniwal
2020-06-15 15:59:37 +05:30
committed by Akshay Joshi
parent a23fad0ba8
commit 641f7bbe9d
17 changed files with 181 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
web/pgadmin/tools/debugger/__init__.py
View File

@@ -570,21 +570,21 @@ def direct_new(trans_id):
user_agent = UserAgent(request.headers.get('User-Agent'))
function_arguments = '('
if de_inst.function_data is not None:
if 'args_name' in de_inst.function_data and \
de_inst.function_data['args_name'] is not None and \
de_inst.function_data['args_name'] != '':
args_name_list = de_inst.function_data['args_name'].split(",")
args_type_list = de_inst.function_data['args_type'].split(",")
index = 0
for args_name in args_name_list:
function_arguments = '{}{} {}, '.format(function_arguments,
args_name,
args_type_list[index])
index += 1
# Remove extra comma and space from the arguments list
if len(args_name_list) > 0:
function_arguments = function_arguments[:-2]
if de_inst.function_data is not None and \
'args_name' in de_inst.function_data and \
de_inst.function_data['args_name'] is not None and \
de_inst.function_data['args_name'] != '':
args_name_list = de_inst.function_data['args_name'].split(",")
args_type_list = de_inst.function_data['args_type'].split(",")
index = 0
for args_name in args_name_list:
function_arguments = '{}{} {}, '.format(function_arguments,
args_name,
args_type_list[index])
index += 1
# Remove extra comma and space from the arguments list
if len(args_name_list) > 0:
function_arguments = function_arguments[:-2]
function_arguments += ')'

16
web/pgadmin/tools/debugger/utils/debugger_instance.py
View File

@@ -58,11 +58,11 @@ class DebuggerInstance(object):
return []
def load_from_session(self):
if '__debugger_sessions' in session:
if str(self.trans_id) in session['__debugger_sessions']:
trans_data = session['__debugger_sessions'][str(self.trans_id)]
self.function_data = trans_data.get('function_data', None)
self.debugger_data = trans_data.get('debugger_data', None)
if '__debugger_sessions' in session and \
str(self.trans_id) in session['__debugger_sessions']:
trans_data = session['__debugger_sessions'][str(self.trans_id)]
self.function_data = trans_data.get('function_data', None)
self.debugger_data = trans_data.get('debugger_data', None)
def update_session(self):
with debugger_sessions_lock:
@@ -76,6 +76,6 @@ class DebuggerInstance(object):
def clear(self):
with debugger_sessions_lock:
if '__debugger_sessions' in session:
if str(self.trans_id) in session['__debugger_sessions']:
session['__debugger_sessions'].pop(str(self.trans_id))
if '__debugger_sessions' in session and \
str(self.trans_id) in session['__debugger_sessions']:
session['__debugger_sessions'].pop(str(self.trans_id))