mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #4856: Remove checks for win NT.

Browse source
This commit is contained in:
Hirokazu Yamamoto 2009-06-28 10:23:00 +00:00
parent ecb4f953dd
commit a3c5609079
5 changed files with 287 additions and 364 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Objects/fileobject.c
View file

@ -16,12 +16,6 @@
#include <windows.h>
#endif
#ifdef _MSC_VER
/* Need GetVersion to see if on NT so safe to use _wfopen */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif /* _MSC_VER */
#if defined(PYOS_OS2) && defined(PYCC_GCC)
#include <io.h>
#endif
@ -2244,6 +2238,7 @@ file_init(PyObject *self, PyObject *args, PyObject *kwds)
char *mode = "r";
int bufsize = -1;
int wideargument = 0;
PyObject *po;
assert(PyFile_Check(self));
if (foself->f_fp != NULL) {
@ -2255,19 +2250,16 @@ file_init(PyObject *self, PyObject *args, PyObject *kwds)
}
#ifdef MS_WINDOWS
if (GetVersion() < 0x80000000) { /* On NT, so wide API available */
PyObject *po;
if (PyArg_ParseTupleAndKeywords(args, kwds, "U|si:file",
kwlist, &po, &mode, &bufsize)) {
wideargument = 1;
if (fill_file_fields(foself, NULL, po, mode,
fclose) == NULL)
goto Error;
} else {
/* Drop the argument parsing error as narrow
strings are also valid. */
PyErr_Clear();
}
if (PyArg_ParseTupleAndKeywords(args, kwds, "U|si:file",
kwlist, &po, &mode, &bufsize)) {
wideargument = 1;
if (fill_file_fields(foself, NULL, po, mode,
fclose) == NULL)
goto Error;
} else {
/* Drop the argument parsing error as narrow
strings are also valid. */
PyErr_Clear();
}
#endif