@@@ cython and python3

[mLib-python] / unihash.pyx

diff --git a/unihash.pyx b/unihash.pyx
index 8ededb0..ba38090 100644 (file)
--- a/unihash.pyx
+++ b/unihash.pyx
@@ -27,40 +27,54 @@ def setglobalkey(uint32 k):
   """setglobalkey(K): set global hash key"""
   unihash_setkey(&unihash_global, k)
 
-cdef class Key:
+cdef class UnihashKey:
   """Key(K): universal hashing key"""
   cdef unihash_info _i
-  cdef uint32 _k
+  cdef readonly uint32 k
   def __cinit__(me, uint32 k):
     unihash_setkey(&me._i, k)
-    me._k = k
-  property k:
-    """K.k -> INT: the key value"""
-    def __get__(me):
-      return _u32(me._k)
+    me.k = k
+  def hash(me, object data):
+    return _unihash_hash(me, data)
+
+## DEPRECATED: compatibility hack
+Key = UnihashKey
+
+cdef const unihash_info *_unihash_keydata(UnihashKey key):
+  if key is None:
+    return &unihash_global
+  else:
+    return &key._i
+
+cdef uint32 _unihash_hash(UnihashKey key, object data):
+  cdef const void *p
+  cdef Py_ssize_t n
+  cdef const unihash_info *i = _unihash_keydata(key)
+  PyObject_AsReadBuffer(data, &p, &n)
+  return unihash_hash(i, UNIHASH_INIT(i), p, n)
 
 cdef class Unihash:
   """Unihash([key = None]): universal hashing context"""
   cdef uint32 _a
-  cdef readonly Key key
-  cdef unihash_info *_i
-  def __cinit__(me, key = None):
-    cdef Key k
+  cdef readonly UnihashKey key
+  cdef const unihash_info *_i
+  def __init__(me, UnihashKey key = None):
     me.key = key
-    if key is None:
-      me._i = &unihash_global
-    else:
-      k = key
-      me._i = &k._i
+    me._i = _unihash_keydata(key)
     me._a = UNIHASH_INIT(me._i)
   def chunk(me, data):
-    """U.chunk(STR): hash the STR"""
-    cdef void *p
+    """U.chunk(BYTES): hash the STR"""
+    cdef const void *p
     cdef Py_ssize_t n
-    PyObject_AsReadBuffer(data, <cvp *>&p, &n)
+    PyObject_AsReadBuffer(data, &p, &n)
     me._a = unihash_hash(me._i, me._a, p, n)
+    return me
   def done(me):
     """U.done() -> INT: the hash of the data"""
-    return _u32(me._a)
+    return me._a
+  @classmethod
+  def hash(cls, data, UnihashKey key = None):
+    """Unihash.hash(BYTES, [key = None]) -> INT: the hash of the data"""
+    return _unihash_hash(key, data)
 
 ###----- That's all, folks --------------------------------------------------