SF.net SVN: fclient: [275] trunk/sandbox/fcp2/client.py

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

Revision: 275
          http://fclient.svn.sourceforge.net/fclient/?rev=275&view=rev
Author:   jurner
Date:     2008-02-26 08:03:02 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
beautifications

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

Modified: trunk/sandbox/fcp2/client.py
===================================================================
--- trunk/sandbox/fcp2/client.py	2008-02-26 15:53:48 UTC (rev 274)
+++ trunk/sandbox/fcp2/client.py	2008-02-26 16:03:02 UTC (rev 275)
@@ -218,15 +218,11 @@
 	"""
 	@ivar events: events the client supports
 	"""
-	
-	DefaultFcpHost = os.environ.get('FCP_HOST', '127.0.0.1').strip()
-	try:
-		DefaultFcpPort = int(os.environ.get('FCP_PORT', '').strip())
-	except ValueError:
-		DefaultFcpPort = 9481
-	
-	
-		
+	ExpectedFcpVersion = 2.0	
+	ExpectedNodeBuild = 1107
+	DefaultFcpHost = os.environ.get('FCP_HOST', '127.0.0.1')
+	DefaultFcpPort = int(os.environ.get('FCP_PORT', '9481'))
+			
 	#TODO: check if required
 	# suggested by Mathew Toseland to use about 32k for mimeType requests
 	# basic sizes of keys are: 1k for SSks and 32k for CHKs
@@ -234,9 +230,7 @@
 	MaxSizeKeyInfo = 32768
 	MinimumRunTime = 1			# minimum time (seconds) the client will run when run() is called (FIX: 0001931)
 	SocketTimeout = 0.1
-	ExpectedFcpVersion = 2.0	
-	ExpectedNodeBuild = 1107
-		
+			
 	consts = consts
 	config = config
 	message = message
@@ -275,6 +269,11 @@
 	## private methods
 	##
 	###############################################################
+	def _captureEvent(self, event, request):
+		if event != self.events.Idle: 
+			self._loggers['Event'].debug(consts.LogMessages.EventTriggered + event.name)
+	
+	
 	def _close(self, msg):
 		"""Closes the client
 		@param msg: message to pass to the ClientDisconnected event or None to not inform listeners
@@ -412,9 +411,7 @@
 				
 				'FcPluginReply': None,
 				})
-			
-		
-		
+				
 		else:
 			msg.params.update({
 				'FcRequestType': requestType,																	# identifies sub message types
@@ -427,11 +424,6 @@
 		msg['Identifier'] = identifier
 		self._requests[identifier] = msg
 		
-	
-	def _captureEvent(self, event, request):
-		if event != self.events.Idle: 
-			self._loggers['Event'].debug(consts.LogMessages.EventTriggered + event.name)
-			
 	###############################################################
 	##
 	## connection related methods


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