[Python-checkins] cpython (2.7): PyUnicode -> PyString and PyLong -> PyInt

[benjamin.peterson]

http://hg.python.org/cpython/rev/ce50e5f724e9
changeset:   92164:ce50e5f724e9
branch:      2.7
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Aug 20 14:25:32 2014 -0500
summary:
  PyUnicode -> PyString and PyLong -> PyInt

files:
  Modules/_ssl.c |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3417,12 +3417,12 @@
     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 @@
         Py_INCREF(pkcs_7_asn);
         return pkcs_7_asn;
     default:
-        return PyLong_FromLong(encodingType);
+        return PyInt_FromLong(encodingType);
     }
 }
 
@@ -3475,7 +3475,7 @@
         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;

-- 
Repository URL: http://hg.python.org/cpython