From 2187cef14f8701afbc88bda80092b9e364061e4e Mon Sep 17 00:00:00 2001
From: Chase Sterling <chase.sterling@gmail.com>
Date: Mon, 26 Nov 2012 22:53:08 -0500
Subject: [PATCH] Add decode_utf8 argument to rencode.loads, which decodes all
 strings from utf8. Update rpc protocol to load all strings as unicode.

---
 DEPENDS            |  1 +
 deluge/rencode.py  | 17 ++++++++++-------
 deluge/transfer.py |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/DEPENDS b/DEPENDS
index a74440609..55b915ff6 100644
--- a/DEPENDS
+++ b/DEPENDS
@@ -11,6 +11,7 @@
  * chardet
  * geoip-database (optional)
  * setproctitle (optional)
+ * rencode >= 1.0.2 (optional), a pure python version is included
 
  * libtorrent >= 0.16.1, or build the included version
 
diff --git a/deluge/rencode.py b/deluge/rencode.py
index 188c51736..b1545a0cc 100644
--- a/deluge/rencode.py
+++ b/deluge/rencode.py
@@ -107,6 +107,9 @@ STR_FIXED_COUNT = 64
 LIST_FIXED_START = STR_FIXED_START+STR_FIXED_COUNT
 LIST_FIXED_COUNT = 64
 
+# Whether strings should be decoded when loading
+_decode_utf8 = False
+
 def decode_int(x, f):
     f += 1
     newf = x.index(CHR_TERM, f)
@@ -159,6 +162,8 @@ def decode_string(x, f):
         raise ValueError
     colon += 1
     s = x[colon:colon+n]
+    if _decode_utf8:
+        s = s.decode('utf8')
     return (s, colon+n)
 
 def decode_list(x, f):
@@ -212,12 +217,8 @@ def make_fixed_length_string_decoders():
     def make_decoder(slen):
         def f(x, f):
             s = x[f+1:f+1+slen]
-            try:
-                t = s.decode("utf8")
-                if len(t) != len(s):
-                    s = t
-            except UnicodeDecodeError:
-                pass
+            if _decode_utf8:
+                s = s.decode("utf8")
             return (s, f+1+slen)
         return f
     for i in range(STR_FIXED_COUNT):
@@ -273,7 +274,9 @@ def encode_dict(x,r):
     r.append(CHR_TERM)
 
 
-def loads(x):
+def loads(x, decode_utf8=False):
+    global _decode_utf8
+    _decode_utf8 = decode_utf8
     try:
         r, l = decode_func[x[0]](x, 0)
     except (IndexError, KeyError):
diff --git a/deluge/transfer.py b/deluge/transfer.py
index c89f89e4f..a09ad98a5 100644
--- a/deluge/transfer.py
+++ b/deluge/transfer.py
@@ -140,7 +140,7 @@ class DelugeTransferProtocol(Protocol):
 
         """
         try:
-            self.message_received(rencode.loads(zlib.decompress(data)))
+            self.message_received(rencode.loads(zlib.decompress(data), decode_utf8=True))
         except Exception, e:
             log.warn("Failed to decompress (%d bytes) and load serialized data "\
                      "with rencode: %s" % (len(data), str(e)))