[Python-checkins] (no subject)

[Batuhan Taşkaya]

To: python-checkins at python.org
Subject: bpo-39802: Only expose set_escdelay and set_tabsize when curses
 extensions are activated (GH-18705)
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

https://github.com/python/cpython/commit/4991cf47c487500fdedc34f0a2eb4b7468a6=
7c3c
commit: 4991cf47c487500fdedc34f0a2eb4b7468a67c3c
branch: master
author: Batuhan Ta=C5=9Fkaya <47358913+isidentical at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-03-03T02:00:10Z
summary:

bpo-39802: Only expose set_escdelay and set_tabsize when curses extensions ar=
e activated (GH-18705)

files:
M Modules/_cursesmodule.c
M Modules/clinic/_cursesmodule.c.h

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 5b29000a24ef8..ee33107ed6222 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -3255,6 +3255,9 @@ _curses_setupterm_impl(PyObject *module, const char *te=
rm, int fd)
     Py_RETURN_NONE;
 }
=20
+#if defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102
+// https://invisible-island.net/ncurses/NEWS.html#index-t20080119
+
 /*[clinic input]
 _curses.get_escdelay
=20
@@ -3334,6 +3337,7 @@ _curses_set_tabsize_impl(PyObject *module, int size)
=20
     return PyCursesCheckERR(set_tabsize(size), "set_tabsize");
 }
+#endif
=20
 /*[clinic input]
 _curses.intrflush
@@ -4508,8 +4512,10 @@ static PyMethodDef PyCurses_methods[] =3D {
     _CURSES_RESIZETERM_METHODDEF
     _CURSES_RESIZE_TERM_METHODDEF
     _CURSES_SAVETTY_METHODDEF
+#if defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102
     _CURSES_GET_ESCDELAY_METHODDEF
     _CURSES_SET_ESCDELAY_METHODDEF
+#endif
     _CURSES_GET_TABSIZE_METHODDEF
     _CURSES_SET_TABSIZE_METHODDEF
     _CURSES_SETSYX_METHODDEF
diff --git a/Modules/clinic/_cursesmodule.c.h b/Modules/clinic/_cursesmodule.=
c.h
index f3780f8e012f9..50d7f213e04e6 100644
--- a/Modules/clinic/_cursesmodule.c.h
+++ b/Modules/clinic/_cursesmodule.c.h
@@ -3040,6 +3040,8 @@ _curses_setupterm(PyObject *module, PyObject *const *ar=
gs, Py_ssize_t nargs, PyO
     return return_value;
 }
=20
+#if (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102)
+
 PyDoc_STRVAR(_curses_get_escdelay__doc__,
 "get_escdelay($module, /)\n"
 "--\n"
@@ -3062,6 +3064,10 @@ _curses_get_escdelay(PyObject *module, PyObject *Py_UN=
USED(ignored))
     return _curses_get_escdelay_impl(module);
 }
=20
+#endif /* (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102) */
+
+#if (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102)
+
 PyDoc_STRVAR(_curses_set_escdelay__doc__,
 "set_escdelay($module, ms, /)\n"
 "--\n"
@@ -3102,6 +3108,10 @@ _curses_set_escdelay(PyObject *module, PyObject *arg)
     return return_value;
 }
=20
+#endif /* (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102) */
+
+#if (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102)
+
 PyDoc_STRVAR(_curses_get_tabsize__doc__,
 "get_tabsize($module, /)\n"
 "--\n"
@@ -3123,6 +3133,10 @@ _curses_get_tabsize(PyObject *module, PyObject *Py_UNU=
SED(ignored))
     return _curses_get_tabsize_impl(module);
 }
=20
+#endif /* (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102) */
+
+#if (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102)
+
 PyDoc_STRVAR(_curses_set_tabsize__doc__,
 "set_tabsize($module, size, /)\n"
 "--\n"
@@ -3162,6 +3176,8 @@ _curses_set_tabsize(PyObject *module, PyObject *arg)
     return return_value;
 }
=20
+#endif /* (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >=3D 20081102) */
+
 PyDoc_STRVAR(_curses_intrflush__doc__,
 "intrflush($module, flag, /)\n"
 "--\n"
@@ -4638,6 +4654,22 @@ _curses_use_default_colors(PyObject *module, PyObject =
*Py_UNUSED(ignored))
     #define _CURSES_HAS_KEY_METHODDEF
 #endif /* !defined(_CURSES_HAS_KEY_METHODDEF) */
=20
+#ifndef _CURSES_GET_ESCDELAY_METHODDEF
+    #define _CURSES_GET_ESCDELAY_METHODDEF
+#endif /* !defined(_CURSES_GET_ESCDELAY_METHODDEF) */
+
+#ifndef _CURSES_SET_ESCDELAY_METHODDEF
+    #define _CURSES_SET_ESCDELAY_METHODDEF
+#endif /* !defined(_CURSES_SET_ESCDELAY_METHODDEF) */
+
+#ifndef _CURSES_GET_TABSIZE_METHODDEF
+    #define _CURSES_GET_TABSIZE_METHODDEF
+#endif /* !defined(_CURSES_GET_TABSIZE_METHODDEF) */
+
+#ifndef _CURSES_SET_TABSIZE_METHODDEF
+    #define _CURSES_SET_TABSIZE_METHODDEF
+#endif /* !defined(_CURSES_SET_TABSIZE_METHODDEF) */
+
 #ifndef _CURSES_IS_TERM_RESIZED_METHODDEF
     #define _CURSES_IS_TERM_RESIZED_METHODDEF
 #endif /* !defined(_CURSES_IS_TERM_RESIZED_METHODDEF) */
@@ -4681,4 +4713,4 @@ _curses_use_default_colors(PyObject *module, PyObject *=
Py_UNUSED(ignored))
 #ifndef _CURSES_USE_DEFAULT_COLORS_METHODDEF
     #define _CURSES_USE_DEFAULT_COLORS_METHODDEF
 #endif /* !defined(_CURSES_USE_DEFAULT_COLORS_METHODDEF) */
-/*[clinic end generated code: output=3D0ca4f95323c5d585 input=3Da9049054013a=
1b77]*/
+/*[clinic end generated code: output=3Db53652f8acafd817 input=3Da9049054013a=
1b77]*/