fixes to pydev fixes
git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/trunk@1351050 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/tashi/client/tashi-client.py b/src/tashi/client/tashi-client.py
index ad504ad..f5daa46 100755
--- a/src/tashi/client/tashi-client.py
+++ b/src/tashi/client/tashi-client.py
@@ -443,16 +443,16 @@
stdout.close()
except:
pass
- for obj in list:
+ for obj in _list:
transformState(obj)
if (keys == None):
- keys = genKeys(list)
+ keys = genKeys(_list)
for (show, k) in show_hide:
if (show):
if (k != "all"):
keys.append(k)
else:
- keys = genKeys(list)
+ keys = genKeys(_list)
else:
if (k in keys):
keys.remove(k)
@@ -461,7 +461,7 @@
maxWidth = {}
for k in keys:
maxWidth[k] = len(k)
- for row in list:
+ for row in _list:
for k in keys:
if (k in row.__dict__):
maxWidth[k] = max(maxWidth[k], len(str(row.__dict__[k])))
@@ -494,8 +494,8 @@
return 1
else:
return 0
- list.sort(cmp=sortFunction)
- for row in list:
+ _list.sort(cmp=sortFunction)
+ for row in _list:
line = ""
for k in keys:
row.__dict__[k] = row.__dict__.get(k, "")
diff --git a/src/tashi/util.py b/src/tashi/util.py
index 1cc56ac..b4a634b 100644
--- a/src/tashi/util.py
+++ b/src/tashi/util.py
@@ -184,15 +184,14 @@
def instantiateImplementation(className, *args):
"""Create an instance of an object with the given class name and list
of args to __init__"""
- obj = None
if (className.rfind(".") != -1):
package = className[:className.rfind(".")]
cmd = "import %s\n" % (package)
else:
cmd = ""
- cmd += "obj = %s(*args)\n" % (className)
+ cmd += "_obj = %s(*args)\n" % (className)
exec cmd in locals()
- return obj
+ return _obj
def convertExceptions(oldFunc):
"""This converts any exception type into a TashiException so that