Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #23995: Removes _WCONIO_DEFINED check as the wchar_t console functions are always available.

This commit is contained in:
Steve Dower 2015-05-13 19:35:49 -07:00
parent 812bc1b86b
commit 71f574f707
2 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
PC/clinic/msvcrtmodule.c.h
View File

@ -222,8 +222,6 @@ msvcrt_getch(PyModuleDef *module, PyObject *Py_UNUSED(ignored))
return return_value;
}
#if defined(_WCONIO_DEFINED)
PyDoc_STRVAR(msvcrt_getwch__doc__,
"getwch($module, /)\n"
"--\n"
@ -248,8 +246,6 @@ msvcrt_getwch(PyModuleDef *module, PyObject *Py_UNUSED(ignored))
return return_value;
}
#endif /* defined(_WCONIO_DEFINED) */
PyDoc_STRVAR(msvcrt_getche__doc__,
"getche($module, /)\n"
"--\n"
@ -274,8 +270,6 @@ msvcrt_getche(PyModuleDef *module, PyObject *Py_UNUSED(ignored))
return return_value;
}
#if defined(_WCONIO_DEFINED)
PyDoc_STRVAR(msvcrt_getwche__doc__,
"getwche($module, /)\n"
"--\n"
@ -300,8 +294,6 @@ msvcrt_getwche(PyModuleDef *module, PyObject *Py_UNUSED(ignored))
return return_value;
}
#endif /* defined(_WCONIO_DEFINED) */
PyDoc_STRVAR(msvcrt_putch__doc__,
"putch($module, char, /)\n"
"--\n"
@ -328,8 +320,6 @@ exit:
return return_value;
}
#if defined(_WCONIO_DEFINED)
PyDoc_STRVAR(msvcrt_putwch__doc__,
"putwch($module, unicode_char, /)\n"
"--\n"
@ -356,8 +346,6 @@ exit:
return return_value;
}
#endif /* defined(_WCONIO_DEFINED) */
PyDoc_STRVAR(msvcrt_ungetch__doc__,
"ungetch($module, char, /)\n"
"--\n"
@ -388,8 +376,6 @@ exit:
return return_value;
}
#if defined(_WCONIO_DEFINED)
PyDoc_STRVAR(msvcrt_ungetwch__doc__,
"ungetwch($module, unicode_char, /)\n"
"--\n"
@ -416,8 +402,6 @@ exit:
return return_value;
}
#endif /* defined(_WCONIO_DEFINED) */
#if defined(_DEBUG)
PyDoc_STRVAR(msvcrt_CrtSetReportFile__doc__,
@ -556,22 +540,6 @@ exit:
return return_value;
}
#ifndef MSVCRT_GETWCH_METHODDEF
#define MSVCRT_GETWCH_METHODDEF
#endif /* !defined(MSVCRT_GETWCH_METHODDEF) */
#ifndef MSVCRT_GETWCHE_METHODDEF
#define MSVCRT_GETWCHE_METHODDEF
#endif /* !defined(MSVCRT_GETWCHE_METHODDEF) */
#ifndef MSVCRT_PUTWCH_METHODDEF
#define MSVCRT_PUTWCH_METHODDEF
#endif /* !defined(MSVCRT_PUTWCH_METHODDEF) */
#ifndef MSVCRT_UNGETWCH_METHODDEF
#define MSVCRT_UNGETWCH_METHODDEF
#endif /* !defined(MSVCRT_UNGETWCH_METHODDEF) */
#ifndef MSVCRT_CRTSETREPORTFILE_METHODDEF
#define MSVCRT_CRTSETREPORTFILE_METHODDEF
#endif /* !defined(MSVCRT_CRTSETREPORTFILE_METHODDEF) */
@ -583,4 +551,4 @@ exit:
#ifndef MSVCRT_SET_ERROR_MODE_METHODDEF
#define MSVCRT_SET_ERROR_MODE_METHODDEF
#endif /* !defined(MSVCRT_SET_ERROR_MODE_METHODDEF) */
/*[clinic end generated code: output=72468bb32006a11b input=a9049054013a1b77]*/
/*[clinic end generated code: output=16613d3119a1fd44 input=a9049054013a1b77]*/

8
PC/msvcrtmodule.c
View File

@ -242,7 +242,6 @@ msvcrt_getch_impl(PyModuleDef *module)
return ch;
}
#ifdef _WCONIO_DEFINED
/*[clinic input]
msvcrt.getwch -> wchar_t
@ -260,7 +259,6 @@ msvcrt_getwch_impl(PyModuleDef *module)
Py_END_ALLOW_THREADS
return ch;
}
#endif /* _WCONIO_DEFINED */
/*[clinic input]
msvcrt.getche -> byte_char
@ -280,7 +278,6 @@ msvcrt_getche_impl(PyModuleDef *module)
return ch;
}
#ifdef _WCONIO_DEFINED
/*[clinic input]
msvcrt.getwche -> wchar_t
@ -298,7 +295,6 @@ msvcrt_getwche_impl(PyModuleDef *module)
Py_END_ALLOW_THREADS
return ch;
}
#endif /* _WCONIO_DEFINED */
/*[clinic input]
msvcrt.putch
@ -317,7 +313,6 @@ msvcrt_putch_impl(PyModuleDef *module, char char_value)
Py_RETURN_NONE;
}
#ifdef _WCONIO_DEFINED
/*[clinic input]
msvcrt.putwch
@ -335,7 +330,6 @@ msvcrt_putwch_impl(PyModuleDef *module, int unicode_char)
Py_RETURN_NONE;
}
#endif /* _WCONIO_DEFINED */
/*[clinic input]
msvcrt.ungetch
@ -359,7 +353,6 @@ msvcrt_ungetch_impl(PyModuleDef *module, char char_value)
Py_RETURN_NONE;
}
#ifdef _WCONIO_DEFINED
/*[clinic input]
msvcrt.ungetwch
@ -377,7 +370,6 @@ msvcrt_ungetwch_impl(PyModuleDef *module, int unicode_char)
return PyErr_SetFromErrno(PyExc_IOError);
Py_RETURN_NONE;
}
#endif /* _WCONIO_DEFINED */
#ifdef _DEBUG
/*[clinic input]