X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/8ddd7c8f0137996e42ff9970e99d036a465ce9e3..b115b0c0883c2af8170b0e733bb1c47b40f2647e:/catacomb/__init__.py

diff --git a/catacomb/__init__.py b/catacomb/__init__.py
index 0996c5c..c810c42 100644
--- a/catacomb/__init__.py
+++ b/catacomb/__init__.py
@@ -1002,14 +1002,9 @@ class Ed448Priv (_EdDSAPriv, Ed448Pub):
     return ed448_sign(me.priv, msg, pub = me.pub, **kw)
 
 ###--------------------------------------------------------------------------
-### Built-in named curves and prime groups.
-
-class _groupmap (object):
-  def __init__(me, map, nth):
-    me.map = map
-    me.nth = nth
-    me._n = max(map.values()) + 1
-    me.i = me._n*[None]
+### Built-in algorithm and group tables.
+
+class _tmp:
   def __repr__(me):
     return '{%s}' % ', '.join(['%r: %r' % kv for kv in me.iteritems()])
   def _repr_pretty_(me, pp, cyclep):
@@ -1017,36 +1012,7 @@ class _groupmap (object):
     if cyclep: pp.text('...')
     else: _pp_dict(pp, me.iteritems())
     pp.end_group(ind, ' }')
-  def __len__(me):
-    return me._n
-  def __contains__(me, k):
-    return k in me.map
-  def __getitem__(me, k):
-    i = me.map[k]
-    if me.i[i] is None:
-      me.i[i] = me.nth(i)
-    return me.i[i]
-  def __setitem__(me, k, v):
-    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)
+_augment(_base._MiscTable, _tmp)
 
 ###--------------------------------------------------------------------------
 ### Prime number generation.