traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #6501: os.device_encoding() returns None on Windows if the application 

has no console.
This commit is contained in:
Victor Stinner 2011-05-23 18:12:52 +02:00
parent a1ae533ac9
commit 7870bdff5a
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -153,6 +153,9 @@ Core and Builtins
Library
-------
- Issue #6501: os.device_encoding() returns None on Windows if the application
has no console.
- Issue #12132: Skip test_build_ext in case the xxmodule is not found.
- Issue #12105: Add O_CLOEXEC to the os module.

23
Modules/posixmodule.c
View File

@ -8495,6 +8495,9 @@ static PyObject *
device_encoding(PyObject *self, PyObject *args)
{
int fd;
#if defined(MS_WINDOWS) || defined(MS_WIN64)
UINT cp;
#endif
if (!PyArg_ParseTuple(args, "i:device_encoding", &fd))
return NULL;
if (!_PyVerify_fd(fd) || !isatty(fd)) {
@ -8502,16 +8505,16 @@ device_encoding(PyObject *self, PyObject *args)
return Py_None;
}
#if defined(MS_WINDOWS) || defined(MS_WIN64)
if (fd == 0) {
char buf[100];
sprintf(buf, "cp%d", GetConsoleCP());
return PyUnicode_FromString(buf);
}
if (fd == 1 || fd == 2) {
char buf[100];
sprintf(buf, "cp%d", GetConsoleOutputCP());
return PyUnicode_FromString(buf);
}
if (fd == 0)
cp = GetConsoleCP();
else if (fd == 1 || fd == 2)
cp = GetConsoleOutputCP();
else
cp = 0;
/* GetConsoleCP() and GetConsoleOutputCP() return 0 if the application
has no console */
if (cp != 0)
return PyUnicode_FromFormat("cp%u", (unsigned int)cp);
#elif defined(CODESET)
{
char *codeset = nl_langinfo(CODESET);