diff options
Diffstat (limited to 'tools/src/py/qpid-tool')
| -rwxr-xr-x | tools/src/py/qpid-tool | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/tools/src/py/qpid-tool b/tools/src/py/qpid-tool index df8b7e3f96..d3b0aa4097 100755 --- a/tools/src/py/qpid-tool +++ b/tools/src/py/qpid-tool @@ -259,24 +259,7 @@ class QmfData(Console): return displayId = long(tokens[0]) methodName = tokens[1] - args = [] - for arg in tokens[2:]: - ## - ## If the argument is a map, list, boolean, integer, or floating (one decimal point), - ## run it through the Python evaluator so it is converted to the correct type. - ## - ## TODO: use a regex for this instead of this convoluted logic, - ## or even consider passing all args through eval() [which would - ## be a minor change to the interface as string args would then - ## always need to be quoted as strings within a map/list would - ## now] - if arg[0] == '{' or arg[0] == '[' or arg[0] == '"' or arg[0] == '\'' or arg == "True" or arg == "False" or \ - ((arg.count('.') < 2 and (arg.count('-') == 0 or \ - (arg.count('-') == 1 and arg[0] == '-')) and \ - arg.replace('.','').replace('-','').isdigit())): - args.append(eval(arg)) - else: - args.append(arg) + args = tokens[2:] obj = None try: @@ -350,7 +333,7 @@ class QmfData(Console): self.notNone(prop.unit), notes, self.notNone(prop.desc)) rows.append(row) for stat in schema.getStatistics(): - row = (stat.name, self.typeName(stat.type), "", self.notNone(stat.unit), "", self.notNone(stat.desc)) + row = (stat.name, self.typeName(stat.type), "", self.notNone(prop.unit), "", self.notNone(prop.desc)) rows.append(row) self.disp.table(title, heads, rows) |