X-Git-Url: https://git.distorted.org.uk/~mdw/mLib-python/blobdiff_plain/d8d81d1b049836f7d4fae7b0077a8ce9e2fc43ac..HEAD:/assoc.pyx

diff --git a/assoc.pyx b/assoc.pyx
index 535fa03..7685dd6 100644
--- a/assoc.pyx
+++ b/assoc.pyx
@@ -1,29 +1,27 @@
-# -*-pyrex-*-
-#
-# $Id$
-#
-# Association tables
-#
-# (c) 2005 Straylight/Edgeware
-#
+### -*-pyrex-*-
+###
+### Association tables
+###
+### (c) 2005 Straylight/Edgeware
+###
 
-#----- Licensing notice -----------------------------------------------------
-#
-# This file is part of the Python interface to mLib.
-#
-# mLib/Python is free software; you can redistribute it and/or modify
-# 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.
+###----- Licensing notice ---------------------------------------------------
+###
+### This file is part of the Python interface to mLib.
+###
+### mLib/Python is free software; you can redistribute it and/or modify
+### 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 struct _assoc_entry:
   sym_base _b
@@ -36,11 +34,11 @@ cdef class AssocTable (Mapping):
     return 0
   cdef void *_find(me, object key, unsigned *f) except NULL:
     cdef void *p
-    cdef int n
+    cdef Py_ssize_t n
     cdef _assoc_entry *e
     cdef atom *a
     a = ATOM_A(atom_pyintern(key))
-    PyObject_AsReadBuffer(key, &p, &n)
+    PyObject_AsReadBuffer(key, <cvp *>&p, &n)
     if f:
       f[0] = 0
       e = <_assoc_entry *>assoc_find(&me._t, a, PSIZEOF(e), f)
@@ -75,10 +73,10 @@ cdef class AssocTable (Mapping):
 cdef class _AssocIter (_MapIterator):
   cdef AssocTable t
   cdef assoc_iter i
-  def __new__(me, AssocTable t):
+  def __cinit__(me, AssocTable t not None):
     me.t = t
     assoc_mkiter(&me.i, &me.t._t)
   cdef void *_next(me):
     return assoc_next(&me.i)
 
-#----- That's all, folks ----------------------------------------------------
+###----- That's all, folks --------------------------------------------------