tidy up cython extensions. No more py2 checks. Better dev version to …

…avoid warning in command line for #213 #release-note

MANIFEST.in

@@ -2,7 +2,6 @@ include MANIFEST.in
 include LICENSE
 include README.rst
 include runtests.py
-include release.py
 include docs/make.bat
 include docs/Makefile
 recursive-exclude * __pycache__

extensions/lib/lib.pxd

@@ -0,0 +1,15 @@
+
+cdef extern from "math.h":
+    double log(double x)
+    double sqrt(double x)
+
+
+cdef double clog2 = log(2.)
+
+cdef inline int int_max(int a, int b): return a if a >= b else b
+cdef inline int int_min(int a, int b): return a if a >= b else b
+
+
+# MSVC does not have log2!
+cdef inline double Log2(double x):
+    return log(x) / clog2

extensions/lib/lib.pyx

@@ -1,3 +1,2 @@
-include "common.pyx"
 include "rparser.pyx"
 include "websocket.pyx"

extensions/lib/rparser.pyx

@@ -69,7 +69,7 @@ cdef class RedisParser:
     def _pack_command(self, args):
         yield ('*%d\r\n' % len(args)).encode('utf-8')
         for value in args:
-            if isinstance(value, strict_string_type):
+            if isinstance(value, str):
                 value = value.encode('utf-8')
             elif not isinstance(value, bytes):
                 value = str(value).encode('utf-8')
@@ -86,7 +86,7 @@ cdef class RedisParser:
                 yield ('$%d\r\n' % len(value)).encode('utf-8')
                 yield value
                 yield CRLF
-            elif isinstance(value, string_type):
+            elif isinstance(value, str):
                 value = value.encode('utf-8')
                 yield ('$%d\r\n' % len(value)).encode('utf-8')
                 yield value

extensions/lib/websocket.pxd

@@ -0,0 +1,13 @@
+
+cdef extern from "websocket.h":
+    object websocket_mask(const char* chunk, const char* key,
+                          size_t chunk_length, size_t mask_length)
+
+
+cdef inline bytes to_bytes(object value, str encoding):
+    if isinstance(value, bytes):
+        return value
+    elif isinstance(value, str):
+        return value.encode(encoding)
+    else:
+        raise TypeError('Requires bytes or string')

extensions/lib/websocket.pyx

@@ -2,7 +2,7 @@ import os
 from struct import pack, unpack
 
 cimport cython
-from common cimport websocket_mask
+from websocket cimport websocket_mask, to_bytes
 
 
 cdef class Frame:
@@ -281,7 +281,7 @@ cdef class FrameParser:
         else:
             masking_key = b''
         if opcode is None:
-            opcode = 1 if isinstance(message, string_type) else 2
+            opcode = 1 if isinstance(message, str) else 2
         data = to_bytes(message or b'', 'utf-8')
         if opcode not in self._opcodes:
             raise self.ProtocolError('WEBSOCKET opcode a reserved value')

extensions/setup.py

@@ -55,6 +55,7 @@ def lib_extension():
 
 def libparams():
     extensions = [lib_extension()]
-    return {'ext_modules': cythonize(extensions),
+    return {'ext_modules': cythonize(extensions,
+                                     include_path=include_dirs),
             'cmdclass': {'build_ext': tolerant_build_ext},
             'include_dirs': include_dirs}

pulsar/utils/version.py

@@ -11,7 +11,7 @@ def get_version(version, filename=None):
     if version[3] == 'alpha' and version[4] == 0:
         git_changeset = get_git_changeset(filename)
         if git_changeset:
-            sub = '-dev.%s' % git_changeset
+            sub = '.dev%s' % git_changeset
     if version[3] != 'final' and not sub:
         sub = '%s%s' % tuple(version[3:])
     return main + sub