Please merge Xpra changes

rencode/__init__.py

@@ -1,10 +1,12 @@
 try:
     from rencode._rencode import *
+    from rencode._rencode import __version__
 except ImportError:
     import rencode.rencode_orig
     prev_all = rencode.rencode_orig.__all__[:]
     del rencode.rencode_orig.__all__
     from rencode.rencode_orig import *
+    from rencode.rencode_orig import __version__
     rencode.rencode_orig.__all__ = prev_all
 
 __all__ = ['dumps', 'loads']

rencode/rencode.pyx

@@ -24,16 +24,15 @@
 
 import sys
 
-py3 = False
-if sys.version_info.major >= 3:
-    py3 = True
+py3 = sys.version_info[0] >= 3
+if py3:
     unicode = str
-    
+
 from cpython cimport bool
 from libc.stdlib cimport realloc, malloc, free
 from libc.string cimport memcpy
 
-__version__ = "1.0.2"
+__version__ = ("Cython", 1, 0, 3)
 
 cdef long long data_length = 0
 cdef bool _decode_utf8 = False
@@ -261,16 +260,23 @@ cdef encode_dict(char **buf, int *pos, x):
             encode(buf, pos, v)
         write_buffer_char(buf, pos, CHR_TERM)
 
+cdef object MAX_SIGNED_INT = 2**31
+cdef object MIN_SIGNED_INT = -MAX_SIGNED_INT
+#note: negating the Python value avoids compiler problems
+#(negating the "long long" constant can make it unsigned with some compilers!)
+cdef object MAX_SIGNED_LONGLONG = int(2**63)
+cdef object MIN_SIGNED_LONGLONG = -MAX_SIGNED_LONGLONG
+
 cdef encode(char **buf, int *pos, data):
     t = type(data)
     if t == int or t == long:
         if -128 <= data < 128:
             encode_char(buf, pos, data)
         elif -32768 <= data < 32768:
             encode_short(buf, pos, data)
-        elif -2147483648 <= data < 2147483648:
+        elif MIN_SIGNED_INT <= data < MAX_SIGNED_INT:
             encode_int(buf, pos, data)
-        elif -9223372036854775808 <= data < 9223372036854775808:
+        elif MIN_SIGNED_LONGLONG <= data < MAX_SIGNED_LONGLONG:
             encode_long_long(buf, pos, data)
         else:
             s = str(data)
@@ -306,6 +312,8 @@ cdef encode(char **buf, int *pos, data):
     elif t == dict:
         encode_dict(buf, pos, data)
 
+    else:
+        raise Exception("type %s not handled" % t)
 
 def dumps(data, float_bits=DEFAULT_FLOAT_BITS):
     """

rencode/rencode_orig.py

@@ -19,7 +19,7 @@
 same rencode version throughout your project.
 """
 
-__version__ = '1.0.2'
+__version__ = ("Python", 1, 0, 3)
 __all__ = ['dumps', 'loads']
 
 # Original bencode module by Petru Paler, et al.
@@ -64,18 +64,16 @@
 
 import sys
 
-py3 = False
-if sys.version_info.major >= 3:
-    py3 = True
+py3 = sys.version_info[0] >= 3
+if py3:
     long = int
     unicode = str
-
-def int2byte(c):
-    if py3:
+    def int2byte(c):
         return bytes([c])
-    else:
+else:
+    def int2byte(c):
         return chr(c)
-       
+
 import struct
 from threading import Lock
 
@@ -196,13 +194,13 @@ def decode_dict(x, f):
     return (r, f + 1)
 
 def decode_true(x, f):
-  return (True, f+1)
+    return (True, f+1)
 
 def decode_false(x, f):
-  return (False, f+1)
+    return (False, f+1)
 
 def decode_none(x, f):
-  return (None, f+1)
+    return (None, f+1)
 
 decode_func = {}
 decode_func[b'0'] = decode_string
@@ -245,7 +243,7 @@ def make_fixed_length_list_decoders():
     def make_decoder(slen):
         def f(x, f):
             r, f = [], f+1
-            for i in range(slen):
+            for _ in range(slen):
                 v, f = decode_func[x[f:f+1]](x, f)
                 r.append(v)
             return (tuple(r), f)
@@ -271,7 +269,7 @@ def make_fixed_length_dict_decoders():
     def make_decoder(slen):
         def f(x, f):
             r, f = {}, f+1
-            for j in range(slen):
+            for _ in range(slen):
                 k, f = decode_func[x[f:f+1]](x, f)
                 r[k], f = decode_func[x[f:f+1]](x, f)
             return (r, f)
@@ -309,7 +307,7 @@ def encode_int(x, r):
         s = str(x)
         if py3:
             s = bytes(s, "ascii")
-            
+
         if len(s) >= MAX_INT_LENGTH:
             raise ValueError('overflow')
         r.extend((CHR_INT, s, CHR_TERM))
@@ -381,8 +379,7 @@ def dumps(x, float_bits=DEFAULT_FLOAT_BITS):
 
     Here float_bits is either 32 or 64.
     """
-    lock.acquire()
-    try:
+    with lock:
         if float_bits == 32:
             encode_func[float] = encode_float32
         elif float_bits == 64:
@@ -391,9 +388,6 @@ def dumps(x, float_bits=DEFAULT_FLOAT_BITS):
             raise ValueError('Float bits (%d) is not 32 or 64' % float_bits)
         r = []
         encode_func[type(x)](x, r)
-    finally:
-        lock.release()
-
     return b''.join(r)
 
 def test():
@@ -433,4 +427,4 @@ def test():
 
 
 if __name__ == '__main__':
-  test()
+    test()

setup.py

@@ -72,7 +72,7 @@ def _unavailable(self, exc):
 
 setup(
   name="rencode",
-  version="1.0.2",
+  version="1.0.3",
   packages=["rencode"],
   description=description,
   author="Andrew Resch",

tests/test_rencode.py

@@ -196,9 +196,17 @@ def test_decode_str_nullbytes(self):
 
     def test_decode_utf8(self):
         s = b"foobarbaz"
-        self.assertIsInstance(rencode.loads(rencode.dumps(s), decode_utf8=True), unicode)
+        #no assertIsInstance with python2.6
+        d = rencode.loads(rencode.dumps(s), decode_utf8=True)
+        if not isinstance(d, unicode):
+            self.fail('%s is not an instance of %r' % (repr(d), unicode))
         s = rencode.dumps(b"\x56\xe4foo\xc3")
         self.assertRaises(UnicodeDecodeError, rencode.loads, s, decode_utf8=True)
-
+
+    def test_version_exposed(self):
+        assert rencode.__version__
+        assert rencode_orig.__version__
+        self.assertEqual(rencode.__version__[1:], rencode_orig.__version__[1:], "version number does not match")
+
 if __name__ == '__main__':
     unittest.main()

tests/timetest.py

@@ -310,7 +310,6 @@ def test_overall_decode_orig():
 
 if __name__ == "__main__":
     import timeit
-    import sys
 
     iterations = 10000
     # ANSI escape codes