From c461c9b380b56a41399e5f540e4bb97cfd9ceffe Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Fri, 10 Apr 2015 15:19:25 +0100 Subject: [PATCH] Stamp the module name onto types properly. Our types are `dynamic', because the Python code adds extra methods to them. Apparently the correct thing to do in such cases is to put the raw type name in the `tp_name' slot, and stuff the module name into `tp_dict' by hand. --- algorithms.c | 26 +++++++++++++------------- buffer.c | 4 ++-- bytestring.c | 2 +- ec.c | 16 ++++++++-------- field.c | 14 +++++++------- group.c | 16 ++++++++-------- key.c | 26 +++++++++++++------------- mp.c | 18 +++++++++--------- passphrase.c | 2 +- pgen.c | 14 +++++++------- pubkey.c | 12 ++++++------ rand.c | 24 ++++++++++++------------ share.c | 12 ++++++------ util.c | 3 +++ 14 files changed, 96 insertions(+), 93 deletions(-) diff --git a/algorithms.c b/algorithms.c index b672498..aeafad3 100644 --- a/algorithms.c +++ b/algorithms.c @@ -230,7 +230,7 @@ static PyMemberDef keyszset_pymembers[] = { static PyTypeObject keysz_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeySZ", /* @tp_name@ */ + "KeySZ", /* @tp_name@ */ sizeof(keysz_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -278,7 +278,7 @@ static PyTypeObject keysz_pytype_skel = { static PyTypeObject keyszany_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeySZAny", /* @tp_name@ */ + "KeySZAny", /* @tp_name@ */ sizeof(keysz_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -326,7 +326,7 @@ static PyTypeObject keyszany_pytype_skel = { static PyTypeObject keyszrange_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeySZRange", /* @tp_name@ */ + "KeySZRange", /* @tp_name@ */ sizeof(keyszrange_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -375,7 +375,7 @@ sizes, and requires the key length to be a multiple of some value.", static PyTypeObject keyszset_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeySZSet", /* @tp_name@ */ + "KeySZSet", /* @tp_name@ */ sizeof(keyszset_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -607,7 +607,7 @@ static PyMethodDef gcipher_pymethods[] = { static PyTypeObject gccipher_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GCCipher", /* @tp_name@ */ + "GCCipher", /* @tp_name@ */ sizeof(gccipher_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -655,7 +655,7 @@ static PyTypeObject gccipher_pytype_skel = { static PyTypeObject gcipher_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GCipher", /* @tp_name@ */ + "GCipher", /* @tp_name@ */ sizeof(gcipher_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -842,7 +842,7 @@ static PyMethodDef ghash_pymethods[] = { static PyTypeObject gchash_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GCHash", /* @tp_name@ */ + "GCHash", /* @tp_name@ */ sizeof(gchash_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -890,7 +890,7 @@ static PyTypeObject gchash_pytype_skel = { static PyTypeObject ghash_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GHash", /* @tp_name@ */ + "GHash", /* @tp_name@ */ sizeof(ghash_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1040,7 +1040,7 @@ static PyGetSetDef gcmac_pygetset[] = { static PyTypeObject gcmac_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GCMAC", /* @tp_name@ */ + "GCMAC", /* @tp_name@ */ sizeof(gchash_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1088,7 +1088,7 @@ static PyTypeObject gcmac_pytype_skel = { static PyTypeObject gmac_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GMAC", /* @tp_name@ */ + "GMAC", /* @tp_name@ */ sizeof(gmac_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1136,7 +1136,7 @@ static PyTypeObject gmac_pytype_skel = { static PyTypeObject gmhash_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GMACHash", /* @tp_name@ */ + "GMACHash", /* @tp_name@ */ sizeof(ghash_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1333,7 +1333,7 @@ static PyMethodDef gprp_pymethods[] = { static PyTypeObject gcprp_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GCPRP", /* @tp_name@ */ + "GCPRP", /* @tp_name@ */ sizeof(gcprp_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1381,7 +1381,7 @@ static PyTypeObject gcprp_pytype_skel = { static PyTypeObject gprp_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GPRP", /* @tp_name@ */ + "GPRP", /* @tp_name@ */ sizeof(gprp_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/buffer.c b/buffer.c index ea38e65..507e6b8 100644 --- a/buffer.c +++ b/buffer.c @@ -285,7 +285,7 @@ static PyBufferProcs rbuf_pybuffer = { static PyTypeObject rbuf_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ReadBuffer", /* @tp_name@ */ + "ReadBuffer", /* @tp_name@ */ sizeof(buf_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -518,7 +518,7 @@ static PyBufferProcs wbuf_pybuffer = { static PyTypeObject wbuf_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.WriteBuffer", /* @tp_name@ */ + "WriteBuffer", /* @tp_name@ */ sizeof(buf_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/bytestring.c b/bytestring.c index 6b45d24..99c114c 100644 --- a/bytestring.c +++ b/bytestring.c @@ -130,7 +130,7 @@ static PyBufferProcs bytestring_pybuffer; static PyTypeObject bytestring_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ByteString", /* @tp_name@ */ + "ByteString", /* @tp_name@ */ 0, /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/ec.c b/ec.c index 21aa352..ef09cf8 100644 --- a/ec.c +++ b/ec.c @@ -589,7 +589,7 @@ static PyNumberMethods ecpt_pynumber = { static PyTypeObject ecpt_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECPt", /* @tp_name@ */ + "ECPt", /* @tp_name@ */ sizeof(ecpt_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -703,7 +703,7 @@ static PyNumberMethods ecptcurve_pynumber = { static PyTypeObject ecptcurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECPtCurve", /* @tp_name@ */ + "ECPtCurve", /* @tp_name@ */ sizeof(ecpt_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1015,7 +1015,7 @@ E.mmul([(P0, N0), (P1, N1), ...]) = N0 P0 + N1 P1 + ...") static PyTypeObject eccurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECCurve", /* @tp_name@ */ + "ECCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1069,7 +1069,7 @@ static PyObject *ecprimecurve_pynew(PyTypeObject *ty, static PyTypeObject ecprimecurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECPrimeCurve", /* @tp_name@ */ + "ECPrimeCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1123,7 +1123,7 @@ static PyObject *ecprimeprojcurve_pynew(PyTypeObject *ty, static PyTypeObject ecprimeprojcurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECPrimeProjCurve", /* @tp_name@ */ + "ECPrimeProjCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1177,7 +1177,7 @@ static PyObject *ecbincurve_pynew(PyTypeObject *ty, static PyTypeObject ecbincurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECBinCurve", /* @tp_name@ */ + "ECBinCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1231,7 +1231,7 @@ static PyObject *ecbinprojcurve_pynew(PyTypeObject *ty, static PyTypeObject ecbinprojcurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECBinProjCurve", /* @tp_name@ */ + "ECBinProjCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1436,7 +1436,7 @@ static PyMethodDef ecinfo_pymethods[] = { static PyTypeObject ecinfo_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECInfo", /* @tp_name@ */ + "ECInfo", /* @tp_name@ */ sizeof(ecinfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/field.c b/field.c index eafa42f..a18a942 100644 --- a/field.c +++ b/field.c @@ -406,7 +406,7 @@ static PyNumberMethods fe_pynumber = { static PyTypeObject fe_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.FE", /* @tp_name@ */ + "FE", /* @tp_name@ */ sizeof(fe_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -536,7 +536,7 @@ static PyMethodDef field_pymethods[] = { static PyTypeObject field_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.Field", /* @tp_name@ */ + "Field", /* @tp_name@ */ sizeof(field_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -614,7 +614,7 @@ static PyGetSetDef primefield_pygetset[] = { static PyTypeObject primefield_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.PrimeField", /* @tp_name@ */ + "PrimeField", /* @tp_name@ */ sizeof(field_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -681,7 +681,7 @@ end: static PyTypeObject niceprimefield_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.NicePrimeField", /* @tp_name@ */ + "NicePrimeField", /* @tp_name@ */ sizeof(field_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -741,7 +741,7 @@ static PyGetSetDef binfield_pygetset[] = { static PyTypeObject binfield_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BinField", /* @tp_name@ */ + "BinField", /* @tp_name@ */ sizeof(field_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -814,7 +814,7 @@ static PyGetSetDef binpolyfield_pygetset[] = { static PyTypeObject binpolyfield_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BinPolyField", /* @tp_name@ */ + "BinPolyField", /* @tp_name@ */ sizeof(field_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -896,7 +896,7 @@ static PyGetSetDef binnormfield_pygetset[] = { static PyTypeObject binnormfield_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BinNormField", /* @tp_name@ */ + "BinNormField", /* @tp_name@ */ sizeof(field_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/group.c b/group.c index 1f733a0..ac10866 100644 --- a/group.c +++ b/group.c @@ -302,7 +302,7 @@ static PyGetSetDef bindhinfo_pygetset[] = { static PyTypeObject fginfo_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.FGInfo", /* @tp_name@ */ + "FGInfo", /* @tp_name@ */ sizeof(fginfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -350,7 +350,7 @@ static PyTypeObject fginfo_pytype_skel = { static PyTypeObject dhinfo_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.DHInfo", /* @tp_name@ */ + "DHInfo", /* @tp_name@ */ sizeof(fginfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -398,7 +398,7 @@ static PyTypeObject dhinfo_pytype_skel = { static PyTypeObject bindhinfo_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BinDHInfo", /* @tp_name@ */ + "BinDHInfo", /* @tp_name@ */ sizeof(fginfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -986,7 +986,7 @@ static PyNumberMethods ge_pynumber = { static PyTypeObject ge_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GE", /* @tp_name@ */ + "GE", /* @tp_name@ */ sizeof(ge_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1056,7 +1056,7 @@ G.mexp([(X0, N0), (X1, N1), ...]) -> X0^N0 X1^N1 ...") static PyTypeObject group_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.Group", /* @tp_name@ */ + "Group", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1133,7 +1133,7 @@ static PyObject *primegroup_pynew(PyTypeObject *ty, static PyTypeObject primegroup_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.PrimeGroup", /* @tp_name@ */ + "PrimeGroup", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1210,7 +1210,7 @@ static PyObject *bingroup_pynew(PyTypeObject *ty, static PyTypeObject bingroup_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BinGroup", /* @tp_name@ */ + "BinGroup", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1288,7 +1288,7 @@ static PyObject *ecgroup_pynew(PyTypeObject *ty, static PyTypeObject ecgroup_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECGroup", /* @tp_name@ */ + "ECGroup", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/key.c b/key.c index 2af0019..6a601c9 100644 --- a/key.c +++ b/key.c @@ -483,7 +483,7 @@ static PyGetSetDef keydata_pygetset[] = { static PyTypeObject keydata_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyData", /* @tp_name@ */ + "KeyData", /* @tp_name@ */ sizeof(keydata_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -560,7 +560,7 @@ static PyGetSetDef keydatabin_pygetset[] = { static PyTypeObject keydatabin_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyDataBinary", /* @tp_name@ */ + "KeyDataBinary", /* @tp_name@ */ sizeof(keydata_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -697,7 +697,7 @@ static PyGetSetDef keydataenc_pygetset[] = { static PyTypeObject keydataenc_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyDataEncrypted", /* @tp_name@ */ + "KeyDataEncrypted", /* @tp_name@ */ sizeof(keydata_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -773,7 +773,7 @@ static PyGetSetDef keydatamp_pygetset[] = { static PyTypeObject keydatamp_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyDataMP", /* @tp_name@ */ + "KeyDataMP", /* @tp_name@ */ sizeof(keydata_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -848,7 +848,7 @@ static PyGetSetDef keydatastr_pygetset[] = { static PyTypeObject keydatastr_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyDataString", /* @tp_name@ */ + "KeyDataString", /* @tp_name@ */ sizeof(keydata_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -928,7 +928,7 @@ static PyGetSetDef keydataec_pygetset[] = { static PyTypeObject keydataec_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyDataECPt", /* @tp_name@ */ + "KeyDataECPt", /* @tp_name@ */ sizeof(keydata_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -999,7 +999,7 @@ static void subkeyiter_pydealloc(PyObject *me) static PyTypeObject subkeyiter_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.SubKeyIter", /* @tp_name@ */ + "SubKeyIter", /* @tp_name@ */ sizeof(subkeyiter_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1134,7 +1134,7 @@ static PyMappingMethods keydatastruct_pymapping = { static PyTypeObject keydatastruct_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyDataStructured", /* @tp_name@ */ + "KeyDataStructured", /* @tp_name@ */ sizeof(keydata_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1210,7 +1210,7 @@ static void keyattriter_pydealloc(PyObject *me) static PyTypeObject keyattriter_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyAttributeIter", /* @tp_name@ */ + "KeyAttributeIter", /* @tp_name@ */ sizeof(keyattriter_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1320,7 +1320,7 @@ static PyMappingMethods keyattrs_pymapping = { static PyTypeObject keyattrs_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyAttributes", /* @tp_name@ */ + "KeyAttributes", /* @tp_name@ */ sizeof(keyattrs_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1622,7 +1622,7 @@ static PyGetSetDef key_pygetset[] = { static PyTypeObject key_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.Key", /* @tp_name@ */ + "Key", /* @tp_name@ */ sizeof(key_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1696,7 +1696,7 @@ static void keyiter_pydealloc(PyObject *me) static PyTypeObject keyiter_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyFileIter", /* @tp_name@ */ + "KeyFileIter", /* @tp_name@ */ sizeof(keyiter_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2017,7 +2017,7 @@ static PyMappingMethods keyfile_pymapping = { static PyTypeObject keyfile_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KeyFile", /* @tp_name@ */ + "KeyFile", /* @tp_name@ */ sizeof(keyfile_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/mp.c b/mp.c index 1177a60..cb63a4f 100644 --- a/mp.c +++ b/mp.c @@ -848,7 +848,7 @@ static PyNumberMethods mp_pynumber = { static PyTypeObject mp_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.MP", /* @tp_name@ */ + "MP", /* @tp_name@ */ sizeof(mp_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1060,7 +1060,7 @@ static PyMethodDef mpmul_pymethods[] = { static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.MPMul", /* @tp_name@ */ + "MPMul", /* @tp_name@ */ sizeof(mpmul_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1327,7 +1327,7 @@ B.mexp([(X0, N0), (X1, N1), ...]) = X0^N0 X1^N1 mod B.m\n\ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.MPMont", /* @tp_name@ */ + "MPMont", /* @tp_name@ */ sizeof(mpmont_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1466,7 +1466,7 @@ B.mexp([(X0, N0), (X1, N1), ...]) = X0^N0 X1^N1 mod B.m\n\ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.MPBarrett", /* @tp_name@ */ + "MPBarrett", /* @tp_name@ */ sizeof(mpbarrett_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1594,7 +1594,7 @@ static PyMethodDef mpreduce_pymethods[] = { static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.MPReduce", /* @tp_name@ */ + "MPReduce", /* @tp_name@ */ sizeof(mpreduce_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1763,7 +1763,7 @@ static PyMethodDef mpcrt_pymethods[] = { static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.MPCRT", /* @tp_name@ */ + "MPCRT", /* @tp_name@ */ sizeof(mpcrt_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2045,7 +2045,7 @@ static PyNumberMethods gf_pynumber = { static PyTypeObject gf_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GF", /* @tp_name@ */ + "GF", /* @tp_name@ */ sizeof(mp_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2268,7 +2268,7 @@ static PyMethodDef gfreduce_pymethods[] = { static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GFReduce", /* @tp_name@ */ + "GFReduce", /* @tp_name@ */ sizeof(gfreduce_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2402,7 +2402,7 @@ static PyMethodDef gfn_pymethods[] = { static PyTypeObject gfn_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GFN", /* @tp_name@ */ + "GFN", /* @tp_name@ */ sizeof(gfn_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/passphrase.c b/passphrase.c index 3d8c84b..7e28f93 100644 --- a/passphrase.c +++ b/passphrase.c @@ -129,7 +129,7 @@ static PyMethodDef pixie_pymethods[] = { static PyTypeObject pixie_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.Pixie", /* @tp_name@ */ + "Pixie", /* @tp_name@ */ sizeof(pixie_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/pgen.c b/pgen.c index 4758c78..15d1f6a 100644 --- a/pgen.c +++ b/pgen.c @@ -197,7 +197,7 @@ static PyNumberMethods pfilt_pynumber = { static PyTypeObject pfilt_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.PrimeFilter", /* @tp_name@ */ + "PrimeFilter", /* @tp_name@ */ sizeof(pfilt_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -330,7 +330,7 @@ static PyMethodDef rabin_pymethods[] = { static PyTypeObject rabin_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.RabinMiller", /* @tp_name@ */ + "RabinMiller", /* @tp_name@ */ sizeof(rabin_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -448,7 +448,7 @@ static PyGetSetDef pgevent_pygetset[] = { static PyTypeObject pgevent_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.PrimeGenEvent", /* @tp_name@ */ + "PrimeGenEvent", /* @tp_name@ */ sizeof(pgevent_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -629,7 +629,7 @@ static PyMethodDef pgev_pymethods[] = { static PyTypeObject pgev_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.PrimeGenBuiltinHandler", /* @tp_name@ */ + "PrimeGenBuiltinHandler", /* @tp_name@ */ sizeof(pgev_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -703,7 +703,7 @@ static PyGetSetDef pgstep_pygetset[] = { static PyTypeObject pgstep_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.PrimeGenStepper", /* @tp_name@ */ + "PrimeGenStepper", /* @tp_name@ */ sizeof(pgstep_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -785,7 +785,7 @@ static PyGetSetDef pgjump_pygetset[] = { static PyTypeObject pgjump_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.PrimeGenJumper", /* @tp_name@ */ + "PrimeGenJumper", /* @tp_name@ */ sizeof(pgjump_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -846,7 +846,7 @@ end: static PyTypeObject pgtest_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.PrimeGenTester", /* @tp_name@ */ + "PrimeGenTester", /* @tp_name@ */ sizeof(pgtest_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/pubkey.c b/pubkey.c index 8790e40..4c4eb1d 100644 --- a/pubkey.c +++ b/pubkey.c @@ -210,7 +210,7 @@ static PyMemberDef dsapriv_pymembers[] = { static PyTypeObject dsapub_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.DSAPub", /* @tp_name@ */ + "DSAPub", /* @tp_name@ */ sizeof(dsa_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -258,7 +258,7 @@ static PyTypeObject dsapub_pytype_skel = { static PyTypeObject dsapriv_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.DSAPriv", /* @tp_name@ */ + "DSAPriv", /* @tp_name@ */ sizeof(dsa_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -423,7 +423,7 @@ static PyMethodDef kcdsapriv_pymethods[] = { static PyTypeObject kcdsapub_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KCDSAPub", /* @tp_name@ */ + "KCDSAPub", /* @tp_name@ */ sizeof(dsa_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -471,7 +471,7 @@ static PyTypeObject kcdsapub_pytype_skel = { static PyTypeObject kcdsapriv_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.KCDSAPriv", /* @tp_name@ */ + "KCDSAPriv", /* @tp_name@ */ sizeof(dsa_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -764,7 +764,7 @@ static PyMethodDef rsapriv_pymethods[] = { static PyTypeObject rsapub_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.RSAPub", /* @tp_name@ */ + "RSAPub", /* @tp_name@ */ sizeof(rsapub_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -812,7 +812,7 @@ static PyTypeObject rsapub_pytype_skel = { static PyTypeObject rsapriv_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.RSAPriv", /* @tp_name@ */ + "RSAPriv", /* @tp_name@ */ sizeof(rsapriv_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/rand.c b/rand.c index 3bcd0a9..37a40e6 100644 --- a/rand.c +++ b/rand.c @@ -270,7 +270,7 @@ static PyMethodDef grand_pymethods[] = { static PyTypeObject grand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GRand", /* @tp_name@ */ + "GRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -327,7 +327,7 @@ static PyObject *lcrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw) static PyTypeObject lcrand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.LCRand", /* @tp_name@ */ + "LCRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -384,7 +384,7 @@ static PyObject *fibrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw) static PyTypeObject fibrand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.FibRand", /* @tp_name@ */ + "FibRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -529,7 +529,7 @@ static PyGetSetDef truerand_pygetset[] = { static PyTypeObject truerand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.TrueRand", /* @tp_name@ */ + "TrueRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -674,7 +674,7 @@ static PyGetSetDef gccrand_pygetset[] = { static PyTypeObject gccrand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GCCRand", /* @tp_name@ */ + "GCCRand", /* @tp_name@ */ sizeof(gccrand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -722,7 +722,7 @@ static PyTypeObject gccrand_pytype_skel = { static PyTypeObject gcrand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GCRand", /* @tp_name@ */ + "GCRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -823,7 +823,7 @@ end: static PyTypeObject sslprf_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.SSLRand", /* @tp_name@ */ + "SSLRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -871,7 +871,7 @@ static PyTypeObject sslprf_pytype_skel = { static PyTypeObject tlsdx_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.TLSDataExpansion", /* @tp_name@ */ + "TLSDataExpansion", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -919,7 +919,7 @@ static PyTypeObject tlsdx_pytype_skel = { static PyTypeObject tlsprf_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.TLSPRF", /* @tp_name@ */ + "TLSPRF", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -999,7 +999,7 @@ static PyGetSetDef dsarand_pygetset[] = { static PyTypeObject dsarand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.DSARand", /* @tp_name@ */ + "DSARand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1130,7 +1130,7 @@ static PyGetSetDef bbs_pygetset[] = { static PyTypeObject bbs_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BlumBlumShub", /* @tp_name@ */ + "BlumBlumShub", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1288,7 +1288,7 @@ static PyGetSetDef bbspriv_pygetset[] = { static PyTypeObject bbspriv_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BBSPriv", /* @tp_name@ */ + "BBSPriv", /* @tp_name@ */ sizeof(bbspriv_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/share.c b/share.c index 7e58783..ad56d31 100644 --- a/share.c +++ b/share.c @@ -63,7 +63,7 @@ static PyGetSetDef gfshare_pygetset[]= { static PyTypeObject gfshare_pytype_skel = { PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */ - "catacomb.GFShare", /* @tp_name@ */ + "GFShare", /* @tp_name@ */ sizeof(gfshare_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -151,7 +151,7 @@ static PyMethodDef gfsharesplit_pymethods[] = { static PyTypeObject gfsharesplit_pytype_skel = { PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */ - "catacomb.GFShareSplit", /* @tp_name@ */ + "GFShareSplit", /* @tp_name@ */ sizeof(gfshare_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -272,7 +272,7 @@ static PyGetSetDef gfsharejoin_pygetset[]= { static PyTypeObject gfsharejoin_pytype_skel = { PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */ - "catacomb.GFShareJoin", /* @tp_name@ */ + "GFShareJoin", /* @tp_name@ */ sizeof(gfshare_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -353,7 +353,7 @@ static PyGetSetDef share_pygetset[]= { static PyTypeObject share_pytype_skel = { PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */ - "catacomb.Share", /* @tp_name@ */ + "Share", /* @tp_name@ */ sizeof(share_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -444,7 +444,7 @@ static PyMethodDef sharesplit_pymethods[] = { static PyTypeObject sharesplit_pytype_skel = { PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */ - "catacomb.ShareSplit", /* @tp_name@ */ + "ShareSplit", /* @tp_name@ */ sizeof(share_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -567,7 +567,7 @@ static PyGetSetDef sharejoin_pygetset[]= { static PyTypeObject sharejoin_pytype_skel = { PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */ - "catacomb.ShareJoin", /* @tp_name@ */ + "ShareJoin", /* @tp_name@ */ sizeof(share_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ diff --git a/util.c b/util.c index f56c7fd..717c3d9 100644 --- a/util.c +++ b/util.c @@ -170,9 +170,12 @@ void *newtype(PyTypeObject *metaty, PyTypeObject *inittype(PyTypeObject *tyskel) { + static PyObject *modname = 0; PyTypeObject *ty = newtype(&PyType_Type, tyskel, 0); + if (!modname) modname = PyString_FromString("catacomb"); ty->tp_flags |= Py_TPFLAGS_HEAPTYPE; PyType_Ready(ty); + PyDict_SetItemString(ty->tp_dict, "__module__", modname); return (ty); } -- 2.11.0