From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 17 Nov 2008 23:53:05 +0000 (+0000)
Subject: catacomb/__init__.py: Add iterfoo methods to _groupmap.
X-Git-Tag: 1.0.1~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/commitdiff_plain/96851f5db8542a4630aaa9b0dbe7cb0495b5ab8b?ds=sidebyside

catacomb/__init__.py: Add iterfoo methods to _groupmap.

This makes them look more like dictionaries, which is nice.
---

diff --git a/catacomb/__init__.py b/catacomb/__init__.py
index cda656d..aaec637 100644
--- a/catacomb/__init__.py
+++ b/catacomb/__init__.py
@@ -331,10 +331,20 @@ class _groupmap (object):
     raise TypeError, "immutable object"
   def __iter__(me):
     return iter(me.map)
+  def iterkeys(me):
+    return iter(me.map)
+  def itervalues(me):
+    for k in me:
+      yield me[k]
+  def iteritems(me):
+    for k in me:
+      yield k, me[k]
   def keys(me):
     return [k for k in me]
   def values(me):
     return [me[k] for k in me]
+  def items(me):
+    return [(k, me[k]) for k in me]
 eccurves = _groupmap(_base._eccurves, ECInfo._curven)
 primegroups = _groupmap(_base._pgroups, DHInfo._groupn)
 bingroups = _groupmap(_base._bingroups, BinDHInfo._groupn)