svn commit: r1295326 - /incubator/tashi/branches/stroucki-accounting/src/tashi/util.py

[st...@apache.org]

Author: stroucki
Date: Wed Feb 29 22:39:59 2012
New Revision: 1295326

URL: http://svn.apache.org/viewvc?rev=1295326&view=rev
Log:
util.py: syntax fixes

Modified:
    incubator/tashi/branches/stroucki-accounting/src/tashi/util.py

Modified: incubator/tashi/branches/stroucki-accounting/src/tashi/util.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-accounting/src/tashi/util.py?rev=1295326&r1=1295325&r2=1295326&view=diff
==============================================================================
--- incubator/tashi/branches/stroucki-accounting/src/tashi/util.py (original)
+++ incubator/tashi/branches/stroucki-accounting/src/tashi/util.py Wed Feb 29 22:39:59 2012
@@ -283,11 +283,11 @@ class Connection:
 		username = None
 		password = None
 
-		if credentials is not None:
+		if self.credentials is not None:
 			username = self.credentials[0]
 			password = self.credentials[1]
 
-		if authAndEncrypt:
+		if self.authAndEncrypt:
 			if username is None:
 				username = raw_input("Enter Username:")
 
@@ -312,7 +312,7 @@ class Connection:
 
 		try:
 			if callable(remotefn):
-				remotefn(args, kwargs)
+				returns = remotefn(*args, **kwargs)
 
 			else:
 				raise TashiException
@@ -321,7 +321,7 @@ class Connection:
 			self.connection = None
 			raise TashiException
 
-		# ENDING
+		return returns
 
 	def __getattr__(self, name):
 		return functools.partial(self.__do, name)
@@ -341,7 +341,7 @@ def createClient(config):
 	if authAndEncrypt:
 		username = config.get('AccessClusterManager', 'username')
 		password = config.get('AccessClusterManager', 'password')
-		client = Connection(host, port, authAndEncrypt, (username, password)
+		client = Connection(host, port, authAndEncrypt, (username, password))
 
 	else:
 		client = Connection(host, port)