~mdw
/
catacomb-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ec.c, field.c, group.c: Allow exponents and scalars from prime fields.
[catacomb-python]
/
t
/
t-mp.py
diff --git
a/t/t-mp.py
b/t/t-mp.py
index
93a1e2f
..
24e80cd
100644
(file)
--- a/
t/t-mp.py
+++ b/
t/t-mp.py
@@
-71,7
+71,8
@@
class TestMP (U.TestCase):
me.assertEqual(str(y), '6556380541834372447694561492436749633')
me.assertEqual(repr(y), 'MP(6556380541834372447694561492436749633)')
me.assertEqual(hex(y), '0x4eeb684a0954ec4ceb255e3e9778d41')
me.assertEqual(str(y), '6556380541834372447694561492436749633')
me.assertEqual(repr(y), 'MP(6556380541834372447694561492436749633)')
me.assertEqual(hex(y), '0x4eeb684a0954ec4ceb255e3e9778d41')
- me.assertEqual(oct(y), '047353320450112516611472622536175135706501')
+ me.assertEqual(oct(y), T.py23('0', '0o') +
+ '47353320450112516611472622536175135706501')
try: bin
except NameError: pass
else: me.assertEqual(bin(C.MP(661438603)),
try: bin
except NameError: pass
else: me.assertEqual(bin(C.MP(661438603)),
@@
-153,6
+154,14
@@
class TestMP (U.TestCase):
while z == z + 1: z *= 2.0
me.assertNotEqual(C.MP(int(z)) + 1, z)
while z == z + 1: z *= 2.0
me.assertNotEqual(C.MP(int(z)) + 1, z)
+ def test_strconv(me):
+ x, y = C.MP(169), "24"
+ for fn in [T.add, T.sub]:
+ me.assertRaises(TypeError, fn, x, y)
+ me.assertRaises(TypeError, fn, y, x)
+ me.assertEqual(x*y, 169*"24")
+ me.assertEqual(y*x, 169*"24")
+
def test_bits(me):
x, y, zero = C.MP(169), C.MP(-24), C.MP(0)
me.assertTrue(x.testbit(0))
def test_bits(me):
x, y, zero = C.MP(169), C.MP(-24), C.MP(0)
me.assertTrue(x.testbit(0))
@@
-395,6
+404,7
@@
class TestGF (U.TestCase):
me.assertEqual(C.GF(E(1, 4)), C.GF(1))
me.assertRaises(TypeError, C.GF, E())
me.assertEqual(C.GF(E(1, 4)), C.GF(1))
me.assertRaises(TypeError, C.GF, E())
+ me.assertNotEqual(x, 5) # no implicit conversion to int
me.assertEqual(int(x), 5)
y = C.GF(0x4eeb684a0954ec4ceb255e3e9778d41)
me.assertEqual(type(int(y)), T.long)
me.assertEqual(int(x), 5)
y = C.GF(0x4eeb684a0954ec4ceb255e3e9778d41)
me.assertEqual(type(int(y)), T.long)
@@
-417,7
+427,8
@@
class TestGF (U.TestCase):
me.assertEqual(str(y), '0x4eeb684a0954ec4ceb255e3e9778d41')
me.assertEqual(repr(y), 'GF(0x4eeb684a0954ec4ceb255e3e9778d41)')
me.assertEqual(hex(y), '0x4eeb684a0954ec4ceb255e3e9778d41')
me.assertEqual(str(y), '0x4eeb684a0954ec4ceb255e3e9778d41')
me.assertEqual(repr(y), 'GF(0x4eeb684a0954ec4ceb255e3e9778d41)')
me.assertEqual(hex(y), '0x4eeb684a0954ec4ceb255e3e9778d41')
- me.assertEqual(oct(y), '047353320450112516611472622536175135706501')
+ me.assertEqual(oct(y), T.py23('0', '0o') +
+ '47353320450112516611472622536175135706501')
try: bin
except NameError: pass
else: me.assertEqual(bin(C.GF(661438603)),
try: bin
except NameError: pass
else: me.assertEqual(bin(C.GF(661438603)),