Mailman 3 November 2017 - Python-checkins

bpo-25720: Fix the method for checking pad state of curses WINDOW (GH-4164) (#4213)
by Serhiy Storchaka 01 Nov '17

01 Nov '17

https://github.com/python/cpython/commit/6ba0b583d6785a256b17d27431908d6701… commit: 6ba0b583d6785a256b17d27431908d67015eeeb6 branch: 2.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-11-01T14:36:48+02:00 summary: bpo-25720: Fix the method for checking pad state of curses WINDOW (GH-4164) (#4213) Modify the code to use ncurses is_pad() instead of checking WINDOW _flags field. If your platform does not provide the is_pad(), the existing way that checks the field will be enabled. Note: This change does not drop support for platforms where do not have both WINDOW _flags field and is_pad(). (cherry picked from commit 8bc7d63560024681dce9f40445f2877b2987e92c) files: A Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst M Include/py_curses.h M Modules/_cursesmodule.c M configure M configure.ac M pyconfig.h.in diff --git a/Include/py_curses.h b/Include/py_curses.h index 67b958c1463..eb77e35d8be 100644 --- a/Include/py_curses.h +++ b/Include/py_curses.h @@ -10,11 +10,6 @@ #ifdef _BSD_WCHAR_T_DEFINED_ #define _WCHAR_T #endif - -/* the following define is necessary for OS X 10.6; without it, the - Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python - can't get at the WINDOW flags field. */ -#define NCURSES_OPAQUE 0 #endif /* __APPLE__ */ #ifdef __FreeBSD__ @@ -44,6 +39,13 @@ #endif #endif +#if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS) +/* The following definition is necessary for ncurses 5.7; without it, + some of [n]curses.h set NCURSES_OPAQUE to 1, and then Python + can't get at the WINDOW flags field. */ +#define NCURSES_OPAQUE 0 +#endif + #ifdef HAVE_NCURSES_H #include <ncurses.h> #else @@ -52,10 +54,13 @@ #ifdef HAVE_NCURSES_H /* configure was checking <curses.h>, but we will - use <ncurses.h>, which has all these features. */ -#ifndef WINDOW_HAS_FLAGS + use <ncurses.h>, which has some or all these features. */ +#if !defined(WINDOW_HAS_FLAGS) && !(NCURSES_OPAQUE+0) #define WINDOW_HAS_FLAGS 1 #endif +#if !defined(HAVE_CURSES_IS_PAD) && NCURSES_VERSION_PATCH+0 >= 20090906 +#define HAVE_CURSES_IS_PAD 1 +#endif #ifndef MVWDELCH_IS_EXPRESSION #define MVWDELCH_IS_EXPRESSION 1 #endif diff --git a/Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst b/Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst new file mode 100644 index 00000000000..a405cd4b544 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst @@ -0,0 +1,2 @@ +Fix the method for checking pad state of curses WINDOW. Patch by Masayuki +Yamamoto. diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index fb51c43fe0e..9149d769cc0 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -663,6 +663,12 @@ int py_mvwdelch(WINDOW *w, int y, int x) } #endif +#if defined(HAVE_CURSES_IS_PAD) +#define py_is_pad(win) is_pad(win) +#elif defined(WINDOW_HAS_FLAGS) +#define py_is_pad(win) ((win) ? ((win)->_flags & _ISPAD) != 0 : FALSE) +#endif + /* chgat, added by Fabian Kreutz <fabian.kreutz at gmx.net> */ static PyObject * @@ -804,10 +810,11 @@ PyCursesWindow_EchoChar(PyCursesWindowObject *self, PyObject *args) return NULL; } -#ifdef WINDOW_HAS_FLAGS - if (self->win->_flags & _ISPAD) +#ifdef py_is_pad + if (py_is_pad(self->win)) { return PyCursesCheckERR(pechochar(self->win, ch | attr), "echochar"); + } else #endif return PyCursesCheckERR(wechochar(self->win, ch | attr), @@ -1243,10 +1250,10 @@ PyCursesWindow_NoOutRefresh(PyCursesWindowObject *self, PyObject *args) int pminrow,pmincol,sminrow,smincol,smaxrow,smaxcol; int rtn; -#ifndef WINDOW_HAS_FLAGS +#ifndef py_is_pad if (0) #else - if (self->win->_flags & _ISPAD) + if (py_is_pad(self->win)) #endif { switch(PyTuple_Size(args)) { @@ -1386,10 +1393,10 @@ PyCursesWindow_Refresh(PyCursesWindowObject *self, PyObject *args) int pminrow,pmincol,sminrow,smincol,smaxrow,smaxcol; int rtn; -#ifndef WINDOW_HAS_FLAGS +#ifndef py_is_pad if (0) #else - if (self->win->_flags & _ISPAD) + if (py_is_pad(self->win)) #endif { switch(PyTuple_Size(args)) { @@ -1455,9 +1462,10 @@ PyCursesWindow_SubWin(PyCursesWindowObject *self, PyObject *args) } /* printf("Subwin: %i %i %i %i \n", nlines, ncols, begin_y, begin_x); */ -#ifdef WINDOW_HAS_FLAGS - if (self->win->_flags & _ISPAD) +#ifdef py_is_pad + if (py_is_pad(self->win)) { win = subpad(self->win, nlines, ncols, begin_y, begin_x); + } else #endif win = subwin(self->win, nlines, ncols, begin_y, begin_x); diff --git a/configure b/configure index 52310f8efda..09a8870077a 100755 --- a/configure +++ b/configure @@ -14639,6 +14639,10 @@ $as_echo "#define MVWDELCH_IS_EXPRESSION 1" >>confdefs.h fi +# Issue #25720: ncurses has introduced the NCURSES_OPAQUE symbol making opaque +# structs since version 5.7. If the macro is defined as zero before including +# [n]curses.h, ncurses will expose fields of the structs regardless of the +# configuration. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5 $as_echo_n "checking whether WINDOW has _flags... " >&6; } if ${ac_cv_window_has_flags+:} false; then : @@ -14646,7 +14650,10 @@ if ${ac_cv_window_has_flags+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <curses.h> + + #define NCURSES_OPAQUE 0 + #include <curses.h> + int main () { @@ -14677,6 +14684,36 @@ $as_echo "#define WINDOW_HAS_FLAGS 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_pad" >&5 +$as_echo_n "checking for is_pad... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <curses.h> +int +main () +{ + +#ifndef is_pad +void *x=is_pad +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_CURSES_IS_PAD 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_term_resized" >&5 $as_echo_n "checking for is_term_resized... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 2cc23cc32fd..f6ee87c53f0 100644 --- a/configure.ac +++ b/configure.ac @@ -4516,9 +4516,16 @@ then [Define if mvwdelch in curses.h is an expression.]) fi +# Issue #25720: ncurses has introduced the NCURSES_OPAQUE symbol making opaque +# structs since version 5.7. If the macro is defined as zero before including +# [n]curses.h, ncurses will expose fields of the structs regardless of the +# configuration. AC_MSG_CHECKING(whether WINDOW has _flags) AC_CACHE_VAL(ac_cv_window_has_flags, -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #define NCURSES_OPAQUE 0 + #include <curses.h> +]], [[ WINDOW *w; w->_flags = 0; ]])], @@ -4533,6 +4540,17 @@ then [Define if WINDOW in curses.h offers a field _flags.]) fi +AC_MSG_CHECKING(for is_pad) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ +#ifndef is_pad +void *x=is_pad +#endif +]])], + [AC_DEFINE(HAVE_CURSES_IS_PAD, 1, Define if you have the 'is_pad' function or macro.) + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)] +) + AC_MSG_CHECKING(for is_term_resized) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[void *x=is_term_resized]])], [AC_DEFINE(HAVE_CURSES_IS_TERM_RESIZED, 1, Define if you have the 'is_term_resized' function.) diff --git a/pyconfig.h.in b/pyconfig.h.in index f3a3ca092da..367b4c247af 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -148,6 +148,9 @@ /* Define if you have the 'immedok' function. */ #undef HAVE_CURSES_IMMEDOK +/* Define if you have the 'is_pad' function or macro. */ +#undef HAVE_CURSES_IS_PAD + /* Define if you have the 'is_term_resized' function. */ #undef HAVE_CURSES_IS_TERM_RESIZED

1 0

bpo-25720: Fix the method for checking pad state of curses WINDOW (GH-4164) (#4212)
by Serhiy Storchaka 01 Nov '17

01 Nov '17

https://github.com/python/cpython/commit/ff6ae4de3874f4922a5883f08bb661c938… commit: ff6ae4de3874f4922a5883f08bb661c93834b060 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-11-01T14:35:41+02:00 summary: bpo-25720: Fix the method for checking pad state of curses WINDOW (GH-4164) (#4212) Modify the code to use ncurses is_pad() instead of checking WINDOW _flags field. If your platform does not provide the is_pad(), the existing way that checks the field will be enabled. Note: This change does not drop support for platforms where do not have both WINDOW _flags field and is_pad(). (cherry picked from commit 8bc7d63560024681dce9f40445f2877b2987e92c) files: A Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst M Include/py_curses.h M Modules/_cursesmodule.c M configure M configure.ac M pyconfig.h.in diff --git a/Include/py_curses.h b/Include/py_curses.h index 251364629a9..b09dde48083 100644 --- a/Include/py_curses.h +++ b/Include/py_curses.h @@ -10,11 +10,6 @@ #ifdef _BSD_WCHAR_T_DEFINED_ #define _WCHAR_T #endif - -/* the following define is necessary for OS X 10.6; without it, the - Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python - can't get at the WINDOW flags field. */ -#define NCURSES_OPAQUE 0 #endif /* __APPLE__ */ #ifdef __FreeBSD__ @@ -44,6 +39,13 @@ #endif #endif +#if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS) +/* The following definition is necessary for ncurses 5.7; without it, + some of [n]curses.h set NCURSES_OPAQUE to 1, and then Python + can't get at the WINDOW flags field. */ +#define NCURSES_OPAQUE 0 +#endif + #ifdef HAVE_NCURSES_H #include <ncurses.h> #else @@ -52,10 +54,13 @@ #ifdef HAVE_NCURSES_H /* configure was checking <curses.h>, but we will - use <ncurses.h>, which has all these features. */ -#ifndef WINDOW_HAS_FLAGS + use <ncurses.h>, which has some or all these features. */ +#if !defined(WINDOW_HAS_FLAGS) && !(NCURSES_OPAQUE+0) #define WINDOW_HAS_FLAGS 1 #endif +#if !defined(HAVE_CURSES_IS_PAD) && NCURSES_VERSION_PATCH+0 >= 20090906 +#define HAVE_CURSES_IS_PAD 1 +#endif #ifndef MVWDELCH_IS_EXPRESSION #define MVWDELCH_IS_EXPRESSION 1 #endif diff --git a/Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst b/Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst new file mode 100644 index 00000000000..a405cd4b544 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst @@ -0,0 +1,2 @@ +Fix the method for checking pad state of curses WINDOW. Patch by Masayuki +Yamamoto. diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index ec6316bf955..94c67c198a2 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -936,6 +936,12 @@ int py_mvwdelch(WINDOW *w, int y, int x) } #endif +#if defined(HAVE_CURSES_IS_PAD) +#define py_is_pad(win) is_pad(win) +#elif defined(WINDOW_HAS_FLAGS) +#define py_is_pad(win) ((win) ? ((win)->_flags & _ISPAD) != 0 : FALSE) +#endif + /* chgat, added by Fabian Kreutz <fabian.kreutz at gmx.net> */ static PyObject * @@ -1075,10 +1081,11 @@ PyCursesWindow_EchoChar(PyCursesWindowObject *self, PyObject *args) if (!PyCurses_ConvertToChtype(self, temp, &ch)) return NULL; -#ifdef WINDOW_HAS_FLAGS - if (self->win->_flags & _ISPAD) +#ifdef py_is_pad + if (py_is_pad(self->win)) { return PyCursesCheckERR(pechochar(self->win, ch | attr), "echochar"); + } else #endif return PyCursesCheckERR(wechochar(self->win, ch | attr), @@ -1607,10 +1614,10 @@ PyCursesWindow_NoOutRefresh(PyCursesWindowObject *self, PyObject *args) int pminrow,pmincol,sminrow,smincol,smaxrow,smaxcol; int rtn; -#ifndef WINDOW_HAS_FLAGS +#ifndef py_is_pad if (0) #else - if (self->win->_flags & _ISPAD) + if (py_is_pad(self->win)) #endif { switch(PyTuple_Size(args)) { @@ -1782,10 +1789,10 @@ PyCursesWindow_Refresh(PyCursesWindowObject *self, PyObject *args) int pminrow,pmincol,sminrow,smincol,smaxrow,smaxcol; int rtn; -#ifndef WINDOW_HAS_FLAGS +#ifndef py_is_pad if (0) #else - if (self->win->_flags & _ISPAD) + if (py_is_pad(self->win)) #endif { switch(PyTuple_Size(args)) { @@ -1851,9 +1858,10 @@ PyCursesWindow_SubWin(PyCursesWindowObject *self, PyObject *args) } /* printf("Subwin: %i %i %i %i \n", nlines, ncols, begin_y, begin_x); */ -#ifdef WINDOW_HAS_FLAGS - if (self->win->_flags & _ISPAD) +#ifdef py_is_pad + if (py_is_pad(self->win)) { win = subpad(self->win, nlines, ncols, begin_y, begin_x); + } else #endif win = subwin(self->win, nlines, ncols, begin_y, begin_x); diff --git a/configure b/configure index 37f68ed71b8..7ca386fbe07 100755 --- a/configure +++ b/configure @@ -15897,6 +15897,10 @@ $as_echo "#define MVWDELCH_IS_EXPRESSION 1" >>confdefs.h fi +# Issue #25720: ncurses has introduced the NCURSES_OPAQUE symbol making opaque +# structs since version 5.7. If the macro is defined as zero before including +# [n]curses.h, ncurses will expose fields of the structs regardless of the +# configuration. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5 $as_echo_n "checking whether WINDOW has _flags... " >&6; } if ${ac_cv_window_has_flags+:} false; then : @@ -15904,7 +15908,10 @@ if ${ac_cv_window_has_flags+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <curses.h> + + #define NCURSES_OPAQUE 0 + #include <curses.h> + int main () { @@ -15935,6 +15942,36 @@ $as_echo "#define WINDOW_HAS_FLAGS 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_pad" >&5 +$as_echo_n "checking for is_pad... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <curses.h> +int +main () +{ + +#ifndef is_pad +void *x=is_pad +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_CURSES_IS_PAD 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_term_resized" >&5 $as_echo_n "checking for is_term_resized... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 8f33096332c..33cb78df71c 100644 --- a/configure.ac +++ b/configure.ac @@ -4993,9 +4993,16 @@ then [Define if mvwdelch in curses.h is an expression.]) fi +# Issue #25720: ncurses has introduced the NCURSES_OPAQUE symbol making opaque +# structs since version 5.7. If the macro is defined as zero before including +# [n]curses.h, ncurses will expose fields of the structs regardless of the +# configuration. AC_MSG_CHECKING(whether WINDOW has _flags) AC_CACHE_VAL(ac_cv_window_has_flags, -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #define NCURSES_OPAQUE 0 + #include <curses.h> +]], [[ WINDOW *w; w->_flags = 0; ]])], @@ -5010,6 +5017,17 @@ then [Define if WINDOW in curses.h offers a field _flags.]) fi +AC_MSG_CHECKING(for is_pad) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ +#ifndef is_pad +void *x=is_pad +#endif +]])], + [AC_DEFINE(HAVE_CURSES_IS_PAD, 1, Define if you have the 'is_pad' function or macro.) + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)] +) + AC_MSG_CHECKING(for is_term_resized) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[void *x=is_term_resized]])], [AC_DEFINE(HAVE_CURSES_IS_TERM_RESIZED, 1, Define if you have the 'is_term_resized' function.) diff --git a/pyconfig.h.in b/pyconfig.h.in index e93bfe56c6c..bf1efd8c029 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -158,6 +158,9 @@ /* Define if you have the 'immedok' function. */ #undef HAVE_CURSES_IMMEDOK +/* Define if you have the 'is_pad' function or macro. */ +#undef HAVE_CURSES_IS_PAD + /* Define if you have the 'is_term_resized' function. */ #undef HAVE_CURSES_IS_TERM_RESIZED

1 0

bpo-31919: Fix building the curses module on OpenIndiana. (#4211)
by Serhiy Storchaka 01 Nov '17

01 Nov '17

https://github.com/python/cpython/commit/894ebd065e02debf20c0657d26020ecc42… commit: 894ebd065e02debf20c0657d26020ecc42b7534f branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-11-01T14:34:20+02:00 summary: bpo-31919: Fix building the curses module on OpenIndiana. (#4211) files: M Lib/test/test_curses.py M Modules/_cursesmodule.c M configure M configure.ac M pyconfig.h.in diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py index 785a31c622b..514ed83167d 100644 --- a/Lib/test/test_curses.py +++ b/Lib/test/test_curses.py @@ -143,6 +143,7 @@ def test_window_funcs(self): stdscr.idlok(1) if hasattr(stdscr, 'immedok'): stdscr.immedok(1) + stdscr.immedok(0) stdscr.insch('c') stdscr.insdelln(1) stdscr.insnstr('abc', 3) @@ -176,26 +177,27 @@ def test_window_funcs(self): stdscr.setscrreg(10,15) win3 = stdscr.subwin(10,10) win3 = stdscr.subwin(10,10, 5,5) - if hasattr(stdscr, 'syncok'): + if hasattr(stdscr, 'syncok') and not sys.platform.startswith("sunos"): stdscr.syncok(1) stdscr.timeout(5) stdscr.touchline(5,5) stdscr.touchline(5,5,0) stdscr.vline('a', 3) stdscr.vline('a', 3, curses.A_STANDOUT) - stdscr.chgat(5, 2, 3, curses.A_BLINK) - stdscr.chgat(3, curses.A_BOLD) - stdscr.chgat(5, 8, curses.A_UNDERLINE) - stdscr.chgat(curses.A_BLINK) + if hasattr(stdscr, 'chgat'): + stdscr.chgat(5, 2, 3, curses.A_BLINK) + stdscr.chgat(3, curses.A_BOLD) + stdscr.chgat(5, 8, curses.A_UNDERLINE) + stdscr.chgat(curses.A_BLINK) stdscr.refresh() stdscr.vline(1,1, 'a', 3) stdscr.vline(1,1, 'a', 3, curses.A_STANDOUT) - if hasattr(curses, 'resize'): - stdscr.resize() - if hasattr(curses, 'enclose'): - stdscr.enclose() + if hasattr(stdscr, 'resize'): + stdscr.resize(25, 80) + if hasattr(stdscr, 'enclose'): + stdscr.enclose(10, 10) self.assertRaises(ValueError, stdscr.getstr, -400) self.assertRaises(ValueError, stdscr.getstr, 2, 3, -400) @@ -423,6 +425,8 @@ def test_issue21088(self): def test_issue13051(self): stdscr = self.stdscr + if not hasattr(stdscr, 'resize'): + raise unittest.SkipTest('requires curses.window.resize') box = curses.textpad.Textbox(stdscr, insert_mode=True) lines, cols = stdscr.getmaxyx() stdscr.resize(lines-2, cols-2) diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 2a2eed2c487..79629369669 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -941,7 +941,7 @@ int py_mvwdelch(WINDOW *w, int y, int x) #endif /* chgat, added by Fabian Kreutz <fabian.kreutz at gmx.net> */ - +#ifdef HAVE_CURSES_WCHGAT static PyObject * PyCursesWindow_ChgAt(PyCursesWindowObject *self, PyObject *args) { @@ -994,7 +994,7 @@ PyCursesWindow_ChgAt(PyCursesWindowObject *self, PyObject *args) } return PyCursesCheckERR(rtn, "chgat"); } - +#endif static PyObject * PyCursesWindow_DelCh(PyCursesWindowObject *self, PyObject *args) @@ -1985,7 +1985,9 @@ static PyMethodDef PyCursesWindow_Methods[] = { {"attron", (PyCFunction)PyCursesWindow_AttrOn, METH_VARARGS}, {"attrset", (PyCFunction)PyCursesWindow_AttrSet, METH_VARARGS}, {"bkgd", (PyCFunction)PyCursesWindow_Bkgd, METH_VARARGS}, +#ifdef HAVE_CURSES_WCHGAT {"chgat", (PyCFunction)PyCursesWindow_ChgAt, METH_VARARGS}, +#endif {"bkgdset", (PyCFunction)PyCursesWindow_BkgdSet, METH_VARARGS}, {"border", (PyCFunction)PyCursesWindow_Border, METH_VARARGS}, {"box", (PyCFunction)PyCursesWindow_Box, METH_VARARGS}, diff --git a/configure b/configure index 00cfd64a2bd..30df2cee70e 100755 --- a/configure +++ b/configure @@ -15912,6 +15912,36 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchgat" >&5 +$as_echo_n "checking for wchgat... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <curses.h> +int +main () +{ + +#ifndef wchgat +void *x=wchgat +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_CURSES_WCHGAT 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for filter" >&5 $as_echo_n "checking for filter... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 724f7ce64c4..fd158681665 100644 --- a/configure.ac +++ b/configure.ac @@ -5033,6 +5033,17 @@ void *x=syncok [AC_MSG_RESULT(no)] ) +AC_MSG_CHECKING(for wchgat) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ +#ifndef wchgat +void *x=wchgat +#endif +]])], + [AC_DEFINE(HAVE_CURSES_WCHGAT, 1, Define if you have the 'wchgat' function.) + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)] +) + AC_MSG_CHECKING(for filter) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ #ifndef filter diff --git a/pyconfig.h.in b/pyconfig.h.in index f63022449f3..5f8b09a6189 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -179,6 +179,9 @@ /* Define if you have the 'use_env' function. */ #undef HAVE_CURSES_USE_ENV +/* Define if you have the 'wchgat' function. */ +#undef HAVE_CURSES_WCHGAT + /* Define to 1 if you have the declaration of `isfinite', and to 0 if you don't. */ #undef HAVE_DECL_ISFINITE

1 0

Remove nested comments in blake2 (#4173)
by Christian Heimes 01 Nov '17

01 Nov '17

https://github.com/python/cpython/commit/388cd85e51aa9c73f8e7f35f0d06c258be… commit: 388cd85e51aa9c73f8e7f35f0d06c258be7b579c branch: master author: Lars Viklund <zao(a)zao.se> committer: Christian Heimes <christian(a)python.org> date: 2017-11-01T12:23:09Z summary: Remove nested comments in blake2 (#4173) Replace occurence of nested comments in blake2 reference implementation with preprocessor directive for disabling unused code. `blake2s-load-xop.h` is conditionally pulled in only on chips with XOP support, among others the AMD Bulldozer. The malformed comments in the source file breaks the build of `hashlib`'s `_blake2` on GCC 6.3.0. Official reference code on github uses `#if` so this change should be uncontroversial. files: M Modules/_blake2/impl/blake2s-load-xop.h diff --git a/Modules/_blake2/impl/blake2s-load-xop.h b/Modules/_blake2/impl/blake2s-load-xop.h index a3b5d65e2d3..2797722b37b 100644 --- a/Modules/_blake2/impl/blake2s-load-xop.h +++ b/Modules/_blake2/impl/blake2s-load-xop.h @@ -18,8 +18,9 @@ #define TOB(x) ((x)*4*0x01010101 + 0x03020100) /* ..or not TOB */ +#if 0 /* Basic VPPERM emulation, for testing purposes */ -/*static __m128i _mm_perm_epi8(const __m128i src1, const __m128i src2, const __m128i sel) +static __m128i _mm_perm_epi8(const __m128i src1, const __m128i src2, const __m128i sel) { const __m128i sixteen = _mm_set1_epi8(16); const __m128i t0 = _mm_shuffle_epi8(src1, sel); @@ -27,7 +28,8 @@ const __m128i mask = _mm_or_si128(_mm_cmpeq_epi8(sel, sixteen), _mm_cmpgt_epi8(sel, sixteen)); /* (>=16) = 0xff : 00 */ return _mm_blendv_epi8(t0, s1, mask); -}*/ +} +#endif #define LOAD_MSG_0_1(buf) \ buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) );

1 0

bpo-25720: Fix the method for checking pad state of curses WINDOW (#4164)
by Serhiy Storchaka 01 Nov '17

01 Nov '17

https://github.com/python/cpython/commit/8bc7d63560024681dce9f40445f2877b29… commit: 8bc7d63560024681dce9f40445f2877b2987e92c branch: master author: Masayuki Yamamoto <ma3yuki.8mamo10(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-11-01T14:05:26+02:00 summary: bpo-25720: Fix the method for checking pad state of curses WINDOW (#4164) Modify the code to use ncurses is_pad() instead of checking WINDOW _flags field. If your platform does not provide the is_pad(), the existing way that checks the field will be enabled. Note: This change does not drop support for platforms where do not have both WINDOW _flags field and is_pad(). files: A Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst M Include/py_curses.h M Modules/_cursesmodule.c M configure M configure.ac M pyconfig.h.in diff --git a/Include/py_curses.h b/Include/py_curses.h index 2e88112259a..597f419eaca 100644 --- a/Include/py_curses.h +++ b/Include/py_curses.h @@ -10,11 +10,6 @@ #ifdef _BSD_WCHAR_T_DEFINED_ #define _WCHAR_T #endif - -/* the following define is necessary for OS X 10.6; without it, the - Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python - can't get at the WINDOW flags field. */ -#define NCURSES_OPAQUE 0 #endif /* __APPLE__ */ #ifdef __FreeBSD__ @@ -44,6 +39,13 @@ #endif #endif +#if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS) +/* The following definition is necessary for ncurses 5.7; without it, + some of [n]curses.h set NCURSES_OPAQUE to 1, and then Python + can't get at the WINDOW flags field. */ +#define NCURSES_OPAQUE 0 +#endif + #ifdef HAVE_NCURSES_H #include <ncurses.h> #else @@ -52,10 +54,13 @@ #ifdef HAVE_NCURSES_H /* configure was checking <curses.h>, but we will - use <ncurses.h>, which has all these features. */ -#ifndef WINDOW_HAS_FLAGS + use <ncurses.h>, which has some or all these features. */ +#if !defined(WINDOW_HAS_FLAGS) && !(NCURSES_OPAQUE+0) #define WINDOW_HAS_FLAGS 1 #endif +#if !defined(HAVE_CURSES_IS_PAD) && NCURSES_VERSION_PATCH+0 >= 20090906 +#define HAVE_CURSES_IS_PAD 1 +#endif #ifndef MVWDELCH_IS_EXPRESSION #define MVWDELCH_IS_EXPRESSION 1 #endif diff --git a/Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst b/Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst new file mode 100644 index 00000000000..a405cd4b544 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-10-29-17-52-40.bpo-25720.vSvb5h.rst @@ -0,0 +1,2 @@ +Fix the method for checking pad state of curses WINDOW. Patch by Masayuki +Yamamoto. diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index d30bd1ab20f..2a2eed2c487 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -934,6 +934,12 @@ int py_mvwdelch(WINDOW *w, int y, int x) } #endif +#if defined(HAVE_CURSES_IS_PAD) +#define py_is_pad(win) is_pad(win) +#elif defined(WINDOW_HAS_FLAGS) +#define py_is_pad(win) ((win) ? ((win)->_flags & _ISPAD) != 0 : FALSE) +#endif + /* chgat, added by Fabian Kreutz <fabian.kreutz at gmx.net> */ static PyObject * @@ -1073,10 +1079,11 @@ PyCursesWindow_EchoChar(PyCursesWindowObject *self, PyObject *args) if (!PyCurses_ConvertToChtype(self, temp, &ch)) return NULL; -#ifdef WINDOW_HAS_FLAGS - if (self->win->_flags & _ISPAD) +#ifdef py_is_pad + if (py_is_pad(self->win)) { return PyCursesCheckERR(pechochar(self->win, ch | attr), "echochar"); + } else #endif return PyCursesCheckERR(wechochar(self->win, ch | attr), @@ -1603,10 +1610,10 @@ PyCursesWindow_NoOutRefresh(PyCursesWindowObject *self, PyObject *args) int pminrow,pmincol,sminrow,smincol,smaxrow,smaxcol; int rtn; -#ifndef WINDOW_HAS_FLAGS +#ifndef py_is_pad if (0) #else - if (self->win->_flags & _ISPAD) + if (py_is_pad(self->win)) #endif { switch(PyTuple_Size(args)) { @@ -1766,10 +1773,10 @@ PyCursesWindow_Refresh(PyCursesWindowObject *self, PyObject *args) int pminrow,pmincol,sminrow,smincol,smaxrow,smaxcol; int rtn; -#ifndef WINDOW_HAS_FLAGS +#ifndef py_is_pad if (0) #else - if (self->win->_flags & _ISPAD) + if (py_is_pad(self->win)) #endif { switch(PyTuple_Size(args)) { @@ -1835,9 +1842,10 @@ PyCursesWindow_SubWin(PyCursesWindowObject *self, PyObject *args) } /* printf("Subwin: %i %i %i %i \n", nlines, ncols, begin_y, begin_x); */ -#ifdef WINDOW_HAS_FLAGS - if (self->win->_flags & _ISPAD) +#ifdef py_is_pad + if (py_is_pad(self->win)) { win = subpad(self->win, nlines, ncols, begin_y, begin_x); + } else #endif win = subwin(self->win, nlines, ncols, begin_y, begin_x); diff --git a/configure b/configure index bb7cc51407a..00cfd64a2bd 100755 --- a/configure +++ b/configure @@ -15699,6 +15699,10 @@ $as_echo "#define MVWDELCH_IS_EXPRESSION 1" >>confdefs.h fi +# Issue #25720: ncurses has introduced the NCURSES_OPAQUE symbol making opaque +# structs since version 5.7. If the macro is defined as zero before including +# [n]curses.h, ncurses will expose fields of the structs regardless of the +# configuration. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5 $as_echo_n "checking whether WINDOW has _flags... " >&6; } if ${ac_cv_window_has_flags+:} false; then : @@ -15706,7 +15710,10 @@ if ${ac_cv_window_has_flags+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <curses.h> + + #define NCURSES_OPAQUE 0 + #include <curses.h> + int main () { @@ -15737,6 +15744,36 @@ $as_echo "#define WINDOW_HAS_FLAGS 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_pad" >&5 +$as_echo_n "checking for is_pad... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <curses.h> +int +main () +{ + +#ifndef is_pad +void *x=is_pad +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_CURSES_IS_PAD 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_term_resized" >&5 $as_echo_n "checking for is_term_resized... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 8c687d731d5..724f7ce64c4 100644 --- a/configure.ac +++ b/configure.ac @@ -4955,9 +4955,16 @@ then [Define if mvwdelch in curses.h is an expression.]) fi +# Issue #25720: ncurses has introduced the NCURSES_OPAQUE symbol making opaque +# structs since version 5.7. If the macro is defined as zero before including +# [n]curses.h, ncurses will expose fields of the structs regardless of the +# configuration. AC_MSG_CHECKING(whether WINDOW has _flags) AC_CACHE_VAL(ac_cv_window_has_flags, -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #define NCURSES_OPAQUE 0 + #include <curses.h> +]], [[ WINDOW *w; w->_flags = 0; ]])], @@ -4972,6 +4979,17 @@ then [Define if WINDOW in curses.h offers a field _flags.]) fi +AC_MSG_CHECKING(for is_pad) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ +#ifndef is_pad +void *x=is_pad +#endif +]])], + [AC_DEFINE(HAVE_CURSES_IS_PAD, 1, Define if you have the 'is_pad' function or macro.) + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)] +) + AC_MSG_CHECKING(for is_term_resized) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[void *x=is_term_resized]])], [AC_DEFINE(HAVE_CURSES_IS_TERM_RESIZED, 1, Define if you have the 'is_term_resized' function.) diff --git a/pyconfig.h.in b/pyconfig.h.in index afd161c15f0..f63022449f3 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -158,6 +158,9 @@ /* Define if you have the 'immedok' function. */ #undef HAVE_CURSES_IMMEDOK +/* Define if you have the 'is_pad' function or macro. */ +#undef HAVE_CURSES_IS_PAD + /* Define if you have the 'is_term_resized' function. */ #undef HAVE_CURSES_IS_TERM_RESIZED

1 0

Daily reference leaks (4243df51fe43): sum=-4
by solipsis＠pitrou.net 01 Nov '17

01 Nov '17

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [-7, 1, 0] memory blocks, sum=-6 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_spawn leaked [0, 0, -2] memory blocks, sum=-2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogZq6nbP', '--timeout', '7200']

1 0

Fix test_socket.test_create_connection() (#4206)
by Victor Stinner 01 Nov '17

01 Nov '17

https://github.com/python/cpython/commit/280c22a82a6756e9caffef031c564fd98f… commit: 280c22a82a6756e9caffef031c564fd98f1b50e7 branch: master author: Victor Stinner <victor.stinner(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-10-31T19:48:14-07:00 summary: Fix test_socket.test_create_connection() (#4206) bpo-31910: test_create_connection() now catchs also EADDRNOTAVAIL to fix the test on Travis CI. files: M Lib/test/test_socket.py diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 84ec4291335..41eac2396bb 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -4533,6 +4533,10 @@ def test_create_connection(self): expected_errnos = [ errno.ECONNREFUSED, ] if hasattr(errno, 'ENETUNREACH'): expected_errnos.append(errno.ENETUNREACH) + if hasattr(errno, 'EADDRNOTAVAIL'): + # bpo-31910: socket.create_connection() fails randomly + # with EADDRNOTAVAIL on Travis CI + expected_errnos.append(errno.EADDRNOTAVAIL) self.assertIn(cm.exception.errno, expected_errnos)

1 0