SF.net SVN: fclient: [232] trunk/sandbox/fcp/fcp2_0_client.py

[<ju...@us...>]

Revision: 232
          http://fclient.svn.sourceforge.net/fclient/?rev=232&view=rev
Author:   jurner
Date:     2008-02-18 13:59:40 -0800 (Mon, 18 Feb 2008)

Log Message:
-----------
a few fixes

Modified Paths:
--------------
    trunk/sandbox/fcp/fcp2_0_client.py

Modified: trunk/sandbox/fcp/fcp2_0_client.py
===================================================================
--- trunk/sandbox/fcp/fcp2_0_client.py	2008-02-18 13:44:25 UTC (rev 231)
+++ trunk/sandbox/fcp/fcp2_0_client.py	2008-02-18 21:59:40 UTC (rev 232)
@@ -544,7 +544,7 @@
 						
 			# try to Connect socket
 			if self._socket is not None:
-				self.close()
+				self._close(None)
 			self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 			self._socket.settimeout(self.SocketTimeout)
 			try:
@@ -573,7 +573,6 @@
 					
 					elif msg.name == consts.Message.NodeHello:
 						self._nodeHelloMessage = msg
-						self._logMessage.debug(consts.LogMessages.MessageReceived + msg.pprint())
 						# check if version is ok
 						if self.versionCheckNodeHello(msg):
 							self.events.ClientConnected(msg)
@@ -672,10 +671,6 @@
 				
 		CancelPersistentRequests = 0		# for testing... if True, cancels all PersistentRequests
 		
-		if msg.name == consts.Message.ClientSocketTimeout:
-			return True
-		self._logMessage.debug(consts.LogMessages.MessageReceived + msg.pprint())
-				
 		# check if we have an initial request corrosponding to msg
 		requestIdentifier = msg.get('Identifier', None)
 		initialRequest = None if requestIdentifier is None else self._requests.get(requestIdentifier, None)
@@ -1278,6 +1273,7 @@
 			if dispatch:
 				self.events.Idle(msg)
 		else:
+			self._logMessage.debug(consts.LogMessages.MessageReceived + msg.pprint())
 			if dispatch:
 				self.handleMessage(msg)
 		return msg
@@ -1867,8 +1863,7 @@
 				data=None,
 				persistentUserData=persistentUserData,
 				userData=userData,
-				
-				
+								
 				# fcp params
 				Filename=filename,
 				ContentType=contentType,
@@ -1982,9 +1977,9 @@
 				consts.RequestType.PutData,
 				insertURI,
 				#insertURI + 'foo/0/',
-				userData,
-				persistentUserData,
-				data,
+				userData=userData,
+				persistentUserData=persistentUserData,
+				data=data,
 				
 				# fcp params
 				ContentType=contentType,
@@ -2205,7 +2200,6 @@
 				)
 		
 	
-	
 	def modifyPeer(self, identitty, allowLocalAddresses=None, isDisabled=None, isListenOnly=None):
 		"""Modifies a peer node
 		@param identitty: identity of the peer node to modify


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.