SF.net SVN: fclient: [37] trunk/fclient/fclient_lib/fcp/fcp2_0.py

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

Revision: 37
          http://fclient.svn.sourceforge.net/fclient/?rev=37&view=rev
Author:   jUrner
Date:     2007-11-02 09:01:29 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
some fixes

Modified Paths:
--------------
    trunk/fclient/fclient_lib/fcp/fcp2_0.py

Modified: trunk/fclient/fclient_lib/fcp/fcp2_0.py
===================================================================
--- trunk/fclient/fclient_lib/fcp/fcp2_0.py	2007-11-02 08:43:54 UTC (rev 36)
+++ trunk/fclient/fclient_lib/fcp/fcp2_0.py	2007-11-02 16:01:29 UTC (rev 37)
@@ -144,7 +144,6 @@
 		'PeerRemoved',
 		'UnknownNodeIdentifier',
 		
-		'ListPeerNotes',
 		'EndListPeerNotes',
 		'PeerNote',
 		
@@ -443,7 +442,7 @@
 			"""Reads n bytes from socket
 			@param socketObj: socket to read bytes from
 			@param n: (int) number of bytes to read
-			@return: (tuple) error-message or None, bytes read or None if an error occured 
+			@return: (tuple) (error-message or None, bytes read or None) if an error occured 
 			or no bytes could be read
 			"""
 			error = p = None
@@ -452,7 +451,7 @@
 				if not p:
 					p = None
 					raise socket.error('Socket shut down by node')
-			except socket.timeout, d:	# no new messages in queue
+			except socket.timeout, d:	# nothing in the queue
 				error = clss(clss.ClientSocketTimeout)
 			except socket.error, d:
 				error = clss(clss.ClientSocketDied, Exception=socket.error, Details=d)
@@ -853,7 +852,7 @@
 			if note:
 				note = base64.decodestring(note)
 				msg['NoteText'] = note
-			self.events.PeerNote(msg.params, note)
+			self.events.PeerNote(msg.params)
 			return True
 			
 		elif msg.name == self.Message.PeerRemoved:
@@ -1094,9 +1093,9 @@
 	def listPeerNotes(self, identity):
 		"""Lists all text notes associated to a peer
 		@param identifier: peer as returned in a call to L{peerList}
-		@event: ListPeerNotes(event). 
-		@event: ListPeerNote(event, note).
-		@event: EndListPeerNotes(event).
+		@event: ListPeerNote(event, params)
+		@event: EndListPeerNotes(event, params)
+		@note: listPeerNotes() is only available for darknet nodes
 		"""
 		self.sendMessage(
 				self.Message.ListPeerNotes,


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