This reverts r63675 based on the discussion in this thread:
http://mail.python.org/pipermail/python-dev/2008-June/079988.html
Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names
in the spirit of 3.0 are available via a #define only. See the email thread.
diff --git a/PC/_winreg.c b/PC/_winreg.c
index edf2897..74d3343 100644
--- a/PC/_winreg.c
+++ b/PC/_winreg.c
@@ -424,7 +424,7 @@
PyHKEYObject *pyhkey = (PyHKEYObject *)ob;
char resBuf[160];
wsprintf(resBuf, "<PyHKEY:%p>", pyhkey->hkey);
- return PyBytes_FromString(resBuf);
+ return PyString_FromString(resBuf);
}
static int
@@ -767,11 +767,11 @@
return FALSE;
need_decref = 1;
}
- if (!PyBytes_Check(value))
+ if (!PyString_Check(value))
return FALSE;
*retDataSize = 1 + strlen(
- PyBytes_AS_STRING(
- (PyBytesObject *)value));
+ PyString_AS_STRING(
+ (PyStringObject *)value));
}
*retDataBuf = (BYTE *)PyMem_NEW(DWORD, *retDataSize);
if (*retDataBuf==NULL){
@@ -782,8 +782,8 @@
strcpy((char *)*retDataBuf, "");
else
strcpy((char *)*retDataBuf,
- PyBytes_AS_STRING(
- (PyBytesObject *)value));
+ PyString_AS_STRING(
+ (PyStringObject *)value));
if (need_decref)
Py_DECREF(value);
break;
@@ -808,7 +808,7 @@
PyObject *t;
t = PyList_GET_ITEM(
(PyListObject *)value,j);
- if (PyBytes_Check(t)) {
+ if (PyString_Check(t)) {
obs[j] = t;
Py_INCREF(t);
} else if (PyUnicode_Check(t)) {
@@ -821,8 +821,8 @@
} else
goto reg_multi_fail;
size += 1 + strlen(
- PyBytes_AS_STRING(
- (PyBytesObject *)obs[j]));
+ PyString_AS_STRING(
+ (PyStringObject *)obs[j]));
}
*retDataSize = size + 1;
@@ -839,11 +839,11 @@
PyObject *t;
t = obs[j];
strcpy(P,
- PyBytes_AS_STRING(
- (PyBytesObject *)t));
+ PyString_AS_STRING(
+ (PyStringObject *)t));
P += 1 + strlen(
- PyBytes_AS_STRING(
- (PyBytesObject *)t));
+ PyString_AS_STRING(
+ (PyStringObject *)t));
Py_DECREF(obs[j]);
}
/* And doubly-terminate the list... */
@@ -1085,7 +1085,7 @@
if (rc != ERROR_SUCCESS)
return PyErr_SetFromWindowsErrWithFunction(rc, "RegEnumKeyEx");
- retStr = PyBytes_FromStringAndSize(tmpbuf, len);
+ retStr = PyString_FromStringAndSize(tmpbuf, len);
return retStr; /* can be NULL */
}
@@ -1303,17 +1303,17 @@
!= ERROR_SUCCESS)
return PyErr_SetFromWindowsErrWithFunction(rc,
"RegQueryValue");
- retStr = PyBytes_FromStringAndSize(NULL, bufSize);
+ retStr = PyString_FromStringAndSize(NULL, bufSize);
if (retStr == NULL)
return NULL;
- retBuf = PyBytes_AS_STRING(retStr);
+ retBuf = PyString_AS_STRING(retStr);
if ((rc = RegQueryValue(hKey, subKey, retBuf, &bufSize))
!= ERROR_SUCCESS) {
Py_DECREF(retStr);
return PyErr_SetFromWindowsErrWithFunction(rc,
"RegQueryValue");
}
- _PyBytes_Resize(&retStr, strlen(retBuf));
+ _PyString_Resize(&retStr, strlen(retBuf));
return retStr;
}
@@ -1414,14 +1414,14 @@
return NULL;
}
/* XXX - need Unicode support */
- str = PyBytes_AsString(obStrVal);
+ str = PyString_AsString(obStrVal);
if (str == NULL)
return NULL;
- len = PyBytes_Size(obStrVal);
+ len = PyString_Size(obStrVal);
if (obSubKey == Py_None)
subKey = NULL;
else {
- subKey = PyBytes_AsString(obSubKey);
+ subKey = PyString_AsString(obSubKey);
if (subKey == NULL)
return NULL;
}