X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib-python/blobdiff_plain/579d01693c86259110fe7a2c2a6f005f1bdbad5b..23bff39b96e98bc1969d275bc7c43e1d6dd28429:/mapping.pyx diff --git a/mapping.pyx b/mapping.pyx index aa5de85..551261e 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. @@ -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,7 +162,7 @@ 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) @@ -172,6 +172,8 @@ cdef class MapIterBase: def __new__(me): me.i = m._iter() me._init() + def __iter__(me): + return me def __next__(me): cdef void *e e = me.i._next()