Compatibility improvement

Author: whtsky

bencoder.pyx

@@ -26,8 +26,10 @@ from cpython.version cimport PY_MAJOR_VERSION
 IS_PY2 = PY_MAJOR_VERSION == 2
 if IS_PY2:
     END_CHAR = 'e'
+    ARRAY_TYPECODE = b'b'
 else:
     END_CHAR = ord('e')
+    ARRAY_TYPECODE = 'b'
 
 
 class BTFailure(Exception):
@@ -111,46 +113,46 @@ def encode(v, r):
 
 
 def encode_int(long x, r):
-    r.frombytes(b'i')
-    r.frombytes(str(x).encode())
-    r.frombytes(b'e')
+    r.fromstring(b'i')
+    r.fromstring(str(x).encode())
+    r.fromstring(b'e')
 
 
 def encode_long(x, r):
-    r.frombytes(b'i')
-    r.frombytes(str(x).encode())
-    r.frombytes(b'e')
+    r.fromstring(b'i')
+    r.fromstring(str(x).encode())
+    r.fromstring(b'e')
 
 
 def encode_bytes(bytes x, r):
-    r.frombytes(str(len(x)).encode())
-    r.frombytes(b':')
-    r.frombytes(x)
+    r.fromstring(str(len(x)).encode())
+    r.fromstring(b':')
+    r.fromstring(x)
 
 
 def encode_string(str x, r):
-    r.frombytes(str(len(x)).encode())
-    r.frombytes(b':')
-    r.frombytes(x.encode())
+    r.fromstring(str(len(x)).encode())
+    r.fromstring(b':')
+    r.fromstring(x.encode())
 
 
 def encode_list(x, r):
-    r.frombytes(b'l')
+    r.fromstring(b'l')
     for i in x:
         encode(i, r)
-    r.frombytes(b'e')
+    r.fromstring(b'e')
 
 
 def encode_dict(x, r):
-    r.frombytes(b'd')
+    r.fromstring(b'd')
     item_list = list(x.items())
     item_list.sort()
     for k, v in item_list:
         if isinstance(k, str):
             k = k.encode()
         encode_bytes(k, r)
         encode(v, r)
-    r.frombytes(b'e')
+    r.fromstring(b'e')
 
 
 encode_func = {
@@ -167,6 +169,6 @@ encode_func = {
 
 
 def bencode(x):
-    cdef array.array r = array.array(b'b')
+    cdef array.array r = array.array(ARRAY_TYPECODE)
     encode(x, r)
-    return r.tobytes()
+    return r.tostring()

setup.py

@@ -15,32 +15,39 @@
 pyx_path = os.path.join(base_path, 'bencoder.pyx')
 c_path = os.path.join(base_path, 'bencoder.c')
 
-if 'test' in sys.argv and platform.python_implementation() == 'CPython':
+try:
+    import Cython
+    HAVE_CYTHON = True
+except ImportError:
+    HAVE_CYTHON = False
+
+if HAVE_CYTHON:
     if os.path.exists(c_path):
         # Remove C file to force Cython recompile.
         os.remove(c_path)
-    from Cython.Compiler.Options import directive_defaults
-
-    directive_defaults['linetrace'] = True
-    directive_defaults['binding'] = True
-
-    from Cython.Build import cythonize
-    ext_modules = cythonize(Extension(
-        "bencoder",
-        [pyx_path],
-        define_macros=[('CYTHON_TRACE', '1')] 
-    ))
-elif os.path.exists(c_path):
+    if 'test' in sys.argv and platform.python_implementation() == 'CPython':
+        from Cython.Compiler.Options import directive_defaults
+
+        directive_defaults['linetrace'] = True
+        directive_defaults['binding'] = True
+
+        from Cython.Build import cythonize
+        ext_modules = cythonize(Extension(
+            "bencoder",
+            [pyx_path],
+            define_macros=[('CYTHON_TRACE', '1')] 
+        ))
+    else:
+        from Cython.Build import cythonize
+        ext_modules = cythonize(Extension(
+            "bencoder",
+            [pyx_path]
+        ))
+else:
     ext_modules = [Extension(
         'bencoder',
         [c_path]
     )]
-else:
-    from Cython.Build import cythonize
-    ext_modules = cythonize(Extension(
-        "bencoder",
-        [pyx_path]
-    ))
 
 
 class PyTest(TestCommand):