diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-08-20 19:25:32 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-08-20 19:25:32 (GMT) |
| commit | cbb144afc08ee2d0e843a13dc2a81e3abb9ce139 (patch) | |
| tree | 922e969a103876c55b3adb33e4f3e20bca70a9e7 | |
| parent | daeb925cc88cc8fed2030166ade641de28edb396 (diff) | |
| download | cpython-cbb144afc08ee2d0e843a13dc2a81e3abb9ce139.zip cpython-cbb144afc08ee2d0e843a13dc2a81e3abb9ce139.tar.gz cpython-cbb144afc08ee2d0e843a13dc2a81e3abb9ce139.tar.bz2 | |
PyUnicode -> PyString and PyLong -> PyInt
| -rw-r--r-- | Modules/_ssl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 8f4062b..ed4bbfd 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -3417,12 +3417,12 @@ certEncodingType(DWORD encodingType) static PyObject *pkcs_7_asn = NULL; if (x509_asn == NULL) { - x509_asn = PyUnicode_InternFromString("x509_asn"); + x509_asn = PyString_InternFromString("x509_asn"); if (x509_asn == NULL) return NULL; } if (pkcs_7_asn == NULL) { - pkcs_7_asn = PyUnicode_InternFromString("pkcs_7_asn"); + pkcs_7_asn = PyString_InternFromString("pkcs_7_asn"); if (pkcs_7_asn == NULL) return NULL; } @@ -3434,7 +3434,7 @@ certEncodingType(DWORD encodingType) Py_INCREF(pkcs_7_asn); return pkcs_7_asn; default: - return PyLong_FromLong(encodingType); + return PyInt_FromLong(encodingType); } } @@ -3475,7 +3475,7 @@ parseKeyUsage(PCCERT_CONTEXT pCertCtx, DWORD flags) if (usage->rgpszUsageIdentifier[i]) { PyObject *oid; int err; - oid = PyUnicode_FromString(usage->rgpszUsageIdentifier[i]); + oid = PyString_FromString(usage->rgpszUsageIdentifier[i]); if (oid == NULL) { Py_CLEAR(retval); goto error; |