From e79f6ada2fdaa4d33108c272d817897afcbb8862 Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Sat, 23 Jan 2010 23:50:43 +0000
Subject: [PATCH] Move the formatting of RPCRequests to a function so that it's
 not done every time a rpc request comes in

---
 deluge/core/rpcserver.py | 45 ++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py
index b3a37d630..aa9c0bd23 100644
--- a/deluge/core/rpcserver.py
+++ b/deluge/core/rpcserver.py
@@ -86,6 +86,32 @@ def export(auth_level=AUTH_LEVEL_DEFAULT):
     else:
         return wrap
 
+
+def format_request(call):
+    """
+    Format the RPCRequest message for debug printing
+    
+    :param call: the request
+    :type call: a RPCRequest
+    
+    :returns: a formatted string for printing
+    :rtype: str
+    
+    """
+    try:
+        s = call[1] + "("
+        if call[2]:
+            s += ", ".join([str(x) for x in call[2]])
+        if call[3]:
+            if call[2]:
+                s += ", "
+            s += ", ".join([key + "=" + str(value) for key, value in call[3].items()])
+        s += ")"
+    except UnicodeEncodeError:
+        return "UnicodeEncodeError, call: %s" % call
+    else:
+        return s
+        
 class DelugeError(Exception):
     pass
 
@@ -151,24 +177,7 @@ class DelugeRPCProtocol(Protocol):
                 if len(call) != 4:
                     log.debug("Received invalid rpc request: number of items in request is %s", len(call))
                     continue
-
-                # Format the RPCRequest message for debug printing
-                try:
-                    s = call[1] + "("
-                    if call[2]:
-                        s += ", ".join([str(x) for x in call[2]])
-                    if call[3]:
-                        if call[2]:
-                            s += ", "
-                        s += ", ".join([key + "=" + str(value) for key, value in call[3].items()])
-                    s += ")"
-                except UnicodeEncodeError:
-                    pass
-                    #log.debug("RPCRequest had some non-ascii text..")
-                else:
-                    pass
-                    #log.debug("RPCRequest: %s", s)
-
+                #log.debug("RPCRequest: %s", format_request(call))
                 reactor.callLater(0, self.dispatch, *call)
 
     def sendData(self, data):