SF.net SVN: fclient: [445] trunk/fcp2/src/fcp2/client.py

[<jU...@us...>]

Revision: 445
          http://fclient.svn.sourceforge.net/fclient/?rev=445&view=rev
Author:   jUrner
Date:     2008-06-30 23:48:53 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
beautify

Modified Paths:
--------------
    trunk/fcp2/src/fcp2/client.py

Modified: trunk/fcp2/src/fcp2/client.py
===================================================================
--- trunk/fcp2/src/fcp2/client.py	2008-06-30 12:15:39 UTC (rev 444)
+++ trunk/fcp2/src/fcp2/client.py	2008-07-01 06:48:53 UTC (rev 445)
@@ -886,13 +886,13 @@
 					return True
 								
 				requestType = msg['RequestType']
-				if requestType & consts.RequestType.MaskGet:
+				if msg == message.PersistentGet:
 					initialRequest = message.ClientGet()
-				elif requestType & (onsts.RequestType.PutDir | consts.RequestType.PutMultiple):
-					#NOTE: PutDiskDir is just a subtype of PutComplexDir
+				elif msg == message.PersistentPut:
+					initialRequest = message.ClientPut()
+				else:
+					#NOTE: PutDiskDir is just a subtype of PutComplexDir. check PutDirType param to tell appart
 					initialRequest = message.ClientPutComplexDir()
-				else:
-					initialRequest = message.ClientPut()
 					
 				initialRequest.params.update(msg.params)
 				self._requests[initialRequest['Identifier']] = initialRequest
@@ -904,7 +904,7 @@
 				self.events.RequestRestored(initialRequest)
 				return True
 						
-			# known request ..don't handle it
+			# ignore
 			return False
 			
 		


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