catacomb/__init__.py: Support `len' on `_groupmap' objects.

[catacomb-python] / catacomb / __init__.py

diff --git a/catacomb/__init__.py b/catacomb/__init__.py
index 4c225e7ab2645f52b79d8b657c1b39d84e33f370..022c5f97119fc6e88b73a834e529a5d3dab5a14b 100644 (file)
--- a/catacomb/__init__.py
+++ b/catacomb/__init__.py
@@ -229,7 +229,7 @@ class _tmp:
 _augment(PrimeField, _tmp)
 
 class _tmp:
-  def __repr__(me): return '%s(%sL)' % (type(me).__name__, hex(me.p))
+  def __repr__(me): return '%s(%#xL)' % (type(me).__name__, me.p)
   def ec(me, a, b): return ECBinProjCurve(me, a, b)
 _augment(BinField, _tmp)
 
@@ -531,9 +531,12 @@ class _groupmap (object):
   def __init__(me, map, nth):
     me.map = map
     me.nth = nth
-    me.i = [None] * (max(map.values()) + 1)
+    me._n = max(map.values()) + 1
+    me.i = me._n*[None]
   def __repr__(me):
     return '{%s}' % ', '.join(['%r: %r' % (k, me[k]) for k in me])
+  def __len__(me):
+    return me._n
   def __contains__(me, k):
     return k in me.map
   def __getitem__(me, k):