X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/2135a6d38fafd669e214e93b99bc1e4c0867cca0..a9410db7436274a5623ee1dd61f6e45b20f7164c:/ec.c

diff --git a/ec.c b/ec.c
index c9707b7..459c272 100644
--- a/ec.c
+++ b/ec.c
@@ -589,6 +589,7 @@ end:
   return (rc);
 }
 
+#ifdef PY2
 static PyObject *ecpt_pylong(PyObject *me)
 {
   ec p = EC_INIT;
@@ -600,6 +601,7 @@ end:
   EC_DESTROY(&p);
   return (rc);
 }
+#endif
 
 static PyObject *ecpt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
@@ -639,7 +641,9 @@ static const PyNumberMethods ecpt_pynumber = {
   0,					/* @nb_add@ */
   0,					/* @nb_subtract@ */
   0,					/* @nb_multiply@ */
+#ifdef PY2
   0,					/* @nb_divide@ */
+#endif
   0,					/* @nb_remainder@ */
   0,					/* @nb_divmod@ */
   0,					/* @nb_power@ */
@@ -653,17 +657,23 @@ static const PyNumberMethods ecpt_pynumber = {
   0,					/* @nb_and@ */
   0,					/* @nb_xor@ */
   0,					/* @nb_or@ */
+#ifdef PY2
   0,					/* @nb_coerce@ */
+#endif
   ecpt_pyint,				/* @nb_int@ */
-  ecpt_pylong,				/* @nb_long@ */
+  PY23(ecpt_pylong, 0),			/* @nb_long@ */
   0,					/* @nb_float@ */
+#ifdef PY2
   0,					/* @nb_oct@ */
   0,					/* @nb_hex@ */
+#endif
 
   0,					/* @nb_inplace_add@ */
   0,					/* @nb_inplace_subtract@ */
   0,					/* @nb_inplace_multiply@ */
+#ifdef PY2
   0,					/* @nb_inplace_divide@ */
+#endif
   0,					/* @nb_inplace_remainder@ */
   0,					/* @nb_inplace_power@ */
   0,					/* @nb_inplace_lshift@ */
@@ -731,7 +741,7 @@ static const PyTypeObject ecpt_pytype_skel = {
 
 static const PyMemberDef ecpt_pymembers[] = {
 #define MEMBERSTRUCT ecpt_pyobj
-  MEMRNM(curve, T_OBJECT, ob_type, READONLY,
+  MEMRNM(curve, T_OBJECT, PY23(ob_type, ob_base.ob_type), READONLY,
 				    "P.curve -> elliptic curve containing P")
 #undef MEMBERSTRUCT
   { 0 }
@@ -765,7 +775,9 @@ static const PyNumberMethods ecptcurve_pynumber = {
   ecpt_pyadd,				/* @nb_add@ */
   ecpt_pysub,				/* @nb_subtract@ */
   ecpt_pymul,				/* @nb_multiply@ */
+#ifdef PY2
   0,					/* @nb_divide@ */
+#endif
   0,					/* @nb_remainder@ */
   0,					/* @nb_divmod@ */
   0,					/* @nb_power@ */
@@ -779,12 +791,16 @@ static const PyNumberMethods ecptcurve_pynumber = {
   0,					/* @nb_and@ */
   0,					/* @nb_xor@ */
   0,					/* @nb_or@ */
+#ifdef PY2
   0,					/* @nb_coerce@ */
+#endif
   0,					/* @nb_int@ */
   0,					/* @nb_long@ */
   0,					/* @nb_float@ */
+#ifdef PY2
   0,					/* @nb_oct@ */
   0,					/* @nb_hex@ */
+#endif
 
   0,					/* @nb_inplace_add@ */
   0,					/* @nb_inplace_subtract@ */
@@ -1147,7 +1163,7 @@ static const PyTypeObject ecprimecurve_pytype_skel = {
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
-  eccurve_pyrichcompare,		/* @tp_richcompare@ */
+  0,					/* @tp_richcompare@ */
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
@@ -1202,7 +1218,7 @@ static const PyTypeObject ecprimeprojcurve_pytype_skel = {
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
-  eccurve_pyrichcompare,		/* @tp_richcompare@ */
+  0,					/* @tp_richcompare@ */
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
@@ -1257,7 +1273,7 @@ static const PyTypeObject ecbincurve_pytype_skel = {
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
-  eccurve_pyrichcompare,		/* @tp_richcompare@ */
+  0,					/* @tp_richcompare@ */
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
@@ -1312,7 +1328,7 @@ static const PyTypeObject ecbinprojcurve_pytype_skel = {
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
-  eccurve_pyrichcompare,		/* @tp_richcompare@ */
+  0,					/* @tp_richcompare@ */
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */