X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib-python/blobdiff_plain/579d01693c86259110fe7a2c2a6f005f1bdbad5b..a1ce1458d254a60b64add7f1ca44bd638c872097:/mapping.pyx

diff --git a/mapping.pyx b/mapping.pyx
index aa5de85..a7c1e26 100644
--- a/mapping.pyx
+++ b/mapping.pyx
@@ -15,12 +15,12 @@
 # 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.
@@ -50,7 +50,7 @@ cdef class Mapping:
     raise SystemError, 'unimplemented _iter'
 
   ## Initialization
-  def __new__(me, *hunoz, **hukairz):
+  def __cinit__(me, *hunoz, **hukairz):
     me._init()
   def __init__(me, stuff = None, **kw):
     me.update(stuff, kw)
@@ -134,7 +134,7 @@ cdef class Mapping:
         break
       l.append(func(me, e))
     return l
-    
+
   def keys(me):
     return me._list(_map_key)
   def values(me):
@@ -162,16 +162,18 @@ cdef class Mapping:
     return MapValueIter(me)
   def iteritems(me):
     return MapItemIter(me)
-  
+
 cdef class MapIterBase:
   cdef Mapping m
   cdef object (*func)(Mapping m, void *e)
   cdef _MapIterator i
   cdef int _init(me) except -1:
     raise TypeError, 'abstract class'
-  def __new__(me):
+  def __cinit__(me):
     me.i = m._iter()
     me._init()
+  def __iter__(me):
+    return me
   def __next__(me):
     cdef void *e
     e = me.i._next()