diff -r 0e5421d679e7 -r ea526b78ee6c DebugClients/Python/DebugUtilities.py --- a/DebugClients/Python/DebugUtilities.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DebugClients/Python/DebugUtilities.py Tue Mar 07 18:53:18 2017 +0100 @@ -84,7 +84,7 @@ return args, varargs, kwonlyargs, varkw -def formatargvalues(args, varargs, varkw, locals, +def formatargvalues(args, varargs, varkw, localsDict, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, @@ -99,7 +99,7 @@ @type str @param varkw name of the keyword arguments @type str - @param locals reference to the local variables dictionary + @param localsDict reference to the local variables dictionary @type dict @keyparam formatarg argument formatting function @type func @@ -115,14 +115,14 @@ specs = [] for i in range(len(args)): name = args[i] - specs.append(formatarg(name) + formatvalue(locals[name])) + specs.append(formatarg(name) + formatvalue(localsDict[name])) if varargs: - specs.append(formatvarargs(varargs) + formatvalue(locals[varargs])) + specs.append(formatvarargs(varargs) + formatvalue(localsDict[varargs])) if varkw: - specs.append(formatvarkw(varkw) + formatvalue(locals[varkw])) + specs.append(formatvarkw(varkw) + formatvalue(localsDict[varkw])) argvalues = '(' + ', '.join(specs) + ')' - if '__return__' in locals: - argvalues += " -> " + formatvalue(locals['__return__']) + if '__return__' in localsDict: + argvalues += " -> " + formatvalue(localsDict['__return__']) return argvalues