Support encoding subclasses of dict

Author: whtsky

README.rst

@@ -32,3 +32,12 @@ Usage
     with open("debian-8.3.0-amd64-netinst.iso.torrent", "rb") as f:
         torrent = bdecode(f.read())
         print(torrent['announce'])
+
+ChangeLog
+----------
+
+Version 1.1.0
+~~~~~~~~~~~~~~~
+
++ Use OrderedDict instaed of dict
++ Support encoding subclasses of dict

bencoder.pyx

@@ -94,6 +94,18 @@ def bdecode(bytes x):
     return r
 
 
+def encode(v, r):
+    tp = type(v)
+    if tp in encode_func:
+        return encode_func[tp](v, r)
+    else:
+        for tp, func in encode_func.items():
+            if isinstance(v, tp):
+                return func(v, r)
+    raise BTFailure("Unknown Type: %s" % tp)
+
+
+
 def encode_int(int x, list r):
     r.extend((b'i', str(x).encode(), b'e'))
 
@@ -114,19 +126,19 @@ def encode_string(x, list r):
 def encode_list(x, list r):
     r.append(b'l')
     for i in x:
-        encode_func[type(i)](i, r)
+        encode(i, r)
     r.append(b'e')
 
 
-def encode_dict(dict x, list r):
+def encode_dict(x, list r):
     r.append(b'd')
     item_list = list(x.items())
     item_list.sort()
     for k, v in item_list:
         if isinstance(k, str):
             k = k.encode()
         r.extend((str(len(k)).encode(), b':', k))
-        encode_func[type(v)](v, r)
+        encode(v, r)
     r.append(b'e')
 
 
@@ -137,11 +149,12 @@ encode_func = {
     list: encode_list,
     tuple: encode_list,
     dict: encode_dict,
+    OrderedDict: encode_dict,
     bool: encode_bool,
 }
 
 
 def bencode(x):
     r = []
-    encode_func[type(x)](x, r)
+    encode(x, r)
     return b''.join(r)

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='bencoder.pyx',
-    version='1.0.0',
+    version='1.1.0',
     description='Yet another bencode implementation in Cython',
     long_description=open('README.rst', 'r').read(),
     author='whtsky',