X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib-python/blobdiff_plain/20bce5e92b01cd928f26b61be78215117039c561..a1ce1458d254a60b64add7f1ca44bd638c872097:/unihash.pyx

diff --git a/unihash.pyx b/unihash.pyx
index f52e4af..5326ad2 100644
--- a/unihash.pyx
+++ b/unihash.pyx
@@ -15,47 +15,23 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # mLib/Python is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with mLib/Python; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-cdef extern from 'mLib/unihash.h':
-  ctypedef int uint32
-  ctypedef struct unihash_info:
-    pass
-  void unihash_setkey(unihash_info *i, uint32 k)
-  uint32 UNIHASH_INIT(unihash_info *i)
-  uint32 unihash_hash(unihash_info *i, uint32 a, void *p, int sz)
-  unihash_info unihash_global
-
-cdef extern from 'limits.h':
-  enum:
-    LONG_MAX
-
-cdef extern from 'Python.h':
-  int PyObject_AsReadBuffer(obj, void **buf, int *len) except -1
-  PyInt_FromLong(long i)
-  PyLong_FromUnsignedLong(unsigned long i)
-
-cdef _u32(uint32 x):
-  if x < LONG_MAX:
-    return PyInt_FromLong(x)
-  else:
-    return PyLong_FromUnsignedLong(x)
-
 def setglobalkey(uint32 k):
   unihash_setkey(&unihash_global, k)
 
 cdef class Key:
   cdef unihash_info _i
   cdef uint32 _k
-  def __new__(me, uint32 k):
+  def __cinit__(me, uint32 k):
     unihash_setkey(&me._i, k)
     me._k = k
   property k:
@@ -66,7 +42,7 @@ cdef class Unihash:
   cdef uint32 _a
   cdef readonly Key key
   cdef unihash_info *_i
-  def __new__(me, key = None):
+  def __cinit__(me, key = None):
     cdef Key k
     me.key = key
     if key is None: