diff options
| author | Daniel Wozniak <dan@woz.io> | 2018-09-11 15:02:30 -0700 |
|---|---|---|
| committer | Matěj Cepl <mcepl@cepl.eu> | 2018-10-02 13:35:00 +0200 |
| commit | bff6b53c801a69910c6374e1c48fa96502a6c08c (patch) | |
| tree | e6514eb474aa7ab55192dc94f68bc9f76c2de8df | |
| parent | 2b32a803e4be518df18b9136482b6573172bbc27 (diff) | |
| download | m2crypto-bff6b53c801a69910c6374e1c48fa96502a6c08c.tar.gz | |
Centeralize py3 compat
| -rw-r--r-- | SWIG/_asn1.i | 17 | ||||
| -rw-r--r-- | SWIG/_py3k_compat.i | 2 |
2 files changed, 2 insertions, 17 deletions
diff --git a/SWIG/_asn1.i b/SWIG/_asn1.i index 6f73929..0c7ee6d 100644 --- a/SWIG/_asn1.i +++ b/SWIG/_asn1.i @@ -148,28 +148,19 @@ int asn1_integer_set(ASN1_INTEGER *asn1, PyObject *value) { * PyLong_AsLong shims as provided in * /usr/include/python2.7/longobject.h. */ -#if PY_MAJOR_VERSION >= 3 if (PyLong_Check(value)) { int overflow = 0; long val = PyLong_AsLongAndOverflow(value, &overflow); if (overflow == 0) return ASN1_INTEGER_set(asn1, val); } -#else - if (PyInt_Check(value)) - return ASN1_INTEGER_set(asn1, PyInt_AS_LONG(value)); -#endif // PY_MAJOR_VERSION >= 3 if (!PyLong_Check(value)){ PyErr_SetString(PyExc_TypeError, "expected int or long"); return 0; } -#if PY_MAJOR_VERSION >= 3 fmt = PyUnicode_FromString("%x"); -#else - fmt = PyString_FromString("%x"); -#endif // PY_MAJOR_VERSION >= 3 if (!fmt) return 0; @@ -184,11 +175,7 @@ int asn1_integer_set(ASN1_INTEGER *asn1, PyObject *value) { Py_INCREF(value); PyTuple_SET_ITEM(args, 0, value); -#if PY_MAJOR_VERSION >= 3 hex = PyUnicode_Format(fmt, args); -#else - hex = PyString_Format(fmt, args); -#endif // PY_MAJOR_VERSION >= 3 if (!hex){ PyErr_SetString(PyExc_RuntimeError, "PyString_Format() failed"); @@ -200,11 +187,7 @@ int asn1_integer_set(ASN1_INTEGER *asn1, PyObject *value) { Py_DECREF(fmt); Py_DECREF(args); -#if PY_MAJOR_VERSION >= 3 if (BN_hex2bn(&bn, PyUnicode_AsUTF8(hex)) <= 0){ -#else - if (BN_hex2bn(&bn, PyString_AsString(hex)) <= 0){ -#endif // PY_MAJOR_VERSION >= 3 m2_PyErr_Msg(PyExc_RuntimeError); Py_DECREF(hex); return 0; diff --git a/SWIG/_py3k_compat.i b/SWIG/_py3k_compat.i index bb32577..7c90bb4 100644 --- a/SWIG/_py3k_compat.i +++ b/SWIG/_py3k_compat.i @@ -36,6 +36,8 @@ FILE* PyFile_AsFile(PyObject *pyfile) { #define PyLong_FromLong(x) PyInt_FromLong(x) #define PyUnicode_AsUTF8(x) PyString_AsString(x) +#define PyUnicode_FromString(x) PyString_FromString(x) +#define PyUnicode_Format(x, y) PyString_Format(x, y) #endif /* PY_MAJOR_VERSION */ %} |