mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Use unicode (and bytes as appropriate)

Browse source
This commit is contained in:
Neal Norwitz 2007-08-26 07:10:06 +00:00
parent 80e7f27e62
commit 93c56828a6
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_subprocess.py
View file

@ -254,7 +254,7 @@ class ProcessTestCase(unittest.TestCase):
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
cwd=tmpdir) cwd=tmpdir)
normcase = os.path.normcase normcase = os.path.normcase
self.assertEqual(normcase(p.stdout.read()), normcase(tmpdir)) self.assertEqual(normcase(p.stdout.read()), bytes(normcase(tmpdir)))
def test_env(self): def test_env(self):
newenv = os.environ.copy() newenv = os.environ.copy()

32
Modules/posixmodule.c
View file

@ -387,13 +387,13 @@ convertenviron(void)
rc = DosQueryExtLIBPATH(buffer, BEGIN_LIBPATH); rc = DosQueryExtLIBPATH(buffer, BEGIN_LIBPATH);
if (rc == NO_ERROR) { /* (not a type, envname is NOT 'BEGIN_LIBPATH') */ if (rc == NO_ERROR) { /* (not a type, envname is NOT 'BEGIN_LIBPATH') */
PyObject *v = PyString_FromString(buffer); PyObject *v = PyString_FromString(buffer);
PyDict_SetItemString(d, "BEGINLIBPATH", v); PyDict_SetItemString(d, "BEGINLIBPATH", v);
Py_DECREF(v); Py_DECREF(v);
} }
rc = DosQueryExtLIBPATH(buffer, END_LIBPATH); rc = DosQueryExtLIBPATH(buffer, END_LIBPATH);
if (rc == NO_ERROR) { /* (not a typo, envname is NOT 'END_LIBPATH') */ if (rc == NO_ERROR) { /* (not a typo, envname is NOT 'END_LIBPATH') */
PyObject *v = PyString_FromString(buffer); PyObject *v = PyString_FromString(buffer);
PyDict_SetItemString(d, "ENDLIBPATH", v); PyDict_SetItemString(d, "ENDLIBPATH", v);
Py_DECREF(v); Py_DECREF(v);
} }
} }
@ -1581,7 +1581,7 @@ posix_ttyname(PyObject *self, PyObject *args)
#endif #endif
if (ret == NULL) if (ret == NULL)
return posix_error(); return posix_error();
return PyString_FromString(ret); return PyUnicode_FromString(ret);
} }
#endif #endif
@ -1603,7 +1603,7 @@ posix_ctermid(PyObject *self, PyObject *noargs)
#endif #endif
if (ret == NULL) if (ret == NULL)
return posix_error(); return posix_error();
return PyString_FromString(buffer); return PyUnicode_FromString(buffer);
} }
#endif #endif
@ -1883,7 +1883,7 @@ posix_getcwd(PyObject *self, PyObject *noargs)
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (res == NULL) if (res == NULL)
return posix_error(); return posix_error();
return PyString_FromString(buf); return PyUnicode_FromString(buf);
} }
PyDoc_STRVAR(posix_getcwdu__doc__, PyDoc_STRVAR(posix_getcwdu__doc__,
@ -3805,7 +3805,7 @@ posix_getlogin(PyObject *self, PyObject *noargs)
"unable to determine login name"); "unable to determine login name");
} }
else else
result = PyString_FromString(name); result = PyUnicode_FromString(name);
errno = old_errno; errno = old_errno;
return result; return result;
@ -5076,7 +5076,7 @@ posix_strerror(PyObject *self, PyObject *args)
"strerror() argument out of range"); "strerror() argument out of range");
return NULL; return NULL;
} }
return PyString_FromString(message); return PyUnicode_FromString(message);
} }
#endif /* strerror */ #endif /* strerror */
@ -5786,12 +5786,12 @@ posix_confstr(PyObject *self, PyObject *args)
} }
else { else {
if ((unsigned int)len >= sizeof(buffer)) { if ((unsigned int)len >= sizeof(buffer)) {
result = PyString_FromStringAndSize(NULL, len-1); result = PyUnicode_FromStringAndSize(NULL, len-1);
if (result != NULL) if (result != NULL)
confstr(name, PyString_AS_STRING(result), len); confstr(name, PyUnicode_AsString(result), len);
} }
else else
result = PyString_FromStringAndSize(buffer, len-1); result = PyUnicode_FromStringAndSize(buffer, len-1);
} }
} }
return result; return result;
@ -6522,7 +6522,7 @@ posix_getloadavg(PyObject *self, PyObject *noargs)
PyDoc_STRVAR(win32_urandom__doc__, PyDoc_STRVAR(win32_urandom__doc__,
"urandom(n) -> str\n\n\ "urandom(n) -> str\n\n\
Return a string of n random bytes suitable for cryptographic use."); Return n random bytes suitable for cryptographic use.");
typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv,\ typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv,\
LPCSTR pszContainer, LPCSTR pszProvider, DWORD dwProvType,\ LPCSTR pszContainer, LPCSTR pszProvider, DWORD dwProvType,\
@ -6578,11 +6578,11 @@ win32_urandom(PyObject *self, PyObject *args)
} }
/* Allocate bytes */ /* Allocate bytes */
result = PyString_FromStringAndSize(NULL, howMany); result = PyBytes_FromStringAndSize(NULL, howMany);
if (result != NULL) { if (result != NULL) {
/* Get random data */ /* Get random data */
if (! pCryptGenRandom(hCryptProv, howMany, (unsigned char*) if (! pCryptGenRandom(hCryptProv, howMany, (unsigned char*)
PyString_AS_STRING(result))) { PyBytes_AS_STRING(result))) {
Py_DECREF(result); Py_DECREF(result);
return win32_error("CryptGenRandom", NULL); return win32_error("CryptGenRandom", NULL);
} }
@ -6633,7 +6633,7 @@ device_encoding(PyObject *self, PyObject *args)
#include <openssl/rand.h> #include <openssl/rand.h>
PyDoc_STRVAR(vms_urandom__doc__, PyDoc_STRVAR(vms_urandom__doc__,
"urandom(n) -> str\n\n\ "urandom(n) -> str\n\n\
Return a string of n random bytes suitable for cryptographic use."); Return n random bytes suitable for cryptographic use.");
static PyObject* static PyObject*
vms_urandom(PyObject *self, PyObject *args) vms_urandom(PyObject *self, PyObject *args)
@ -6649,11 +6649,11 @@ vms_urandom(PyObject *self, PyObject *args)
"negative argument not allowed"); "negative argument not allowed");
/* Allocate bytes */ /* Allocate bytes */
result = PyString_FromStringAndSize(NULL, howMany); result = PyBytes_FromStringAndSize(NULL, howMany);
if (result != NULL) { if (result != NULL) {
/* Get random data */ /* Get random data */
if (RAND_pseudo_bytes((unsigned char*) if (RAND_pseudo_bytes((unsigned char*)
PyString_AS_STRING(result), PyBytes_AS_STRING(result),
howMany) < 0) { howMany) < 0) {
Py_DECREF(result); Py_DECREF(result);
return PyErr_Format(PyExc_ValueError, return PyErr_Format(PyExc_ValueError,