(original) (raw)

changeset: 105761:31df7d9863f3 parent: 105757:a721bf7dda97 parent: 105760:bfd4140d9c5d user: Benjamin Peterson benjamin@python.org date: Mon Dec 19 23:55:24 2016 -0800 files: Misc/NEWS configure configure.ac pyconfig.h.in description: merge 3.6 (#28932) diff -r a721bf7dda97 -r 31df7d9863f3 Misc/NEWS --- a/Misc/NEWS Tue Dec 20 09:59:47 2016 +0900 +++ b/Misc/NEWS Mon Dec 19 23:55:24 2016 -0800 @@ -13,6 +13,8 @@ - Issue #28927: bytes.fromhex() and bytearray.fromhex() now ignore all ASCII whitespace, not only spaces. Patch by Robert Xiao. +- Issue #28932: Do not include if it does not exist. + - Issue #25677: Correct the positioning of the syntax error caret for indented blocks. Based on patch by Michael Layzell. diff -r a721bf7dda97 -r 31df7d9863f3 Python/random.c --- a/Python/random.c Tue Dec 20 09:59:47 2016 +0900 +++ b/Python/random.c Mon Dec 19 23:55:24 2016 -0800 @@ -12,7 +12,7 @@ # ifdef HAVE_LINUX_RANDOM_H # include # endif -# if defined(HAVE_GETRANDOM) || defined(HAVE_GETENTROPY) +# ifdef HAVE_SYS_RANDOM_H # include # endif # if !defined(HAVE_GETRANDOM) && defined(HAVE_GETRANDOM_SYSCALL) diff -r a721bf7dda97 -r 31df7d9863f3 configure --- a/configure Tue Dec 20 09:59:47 2016 +0900 +++ b/configure Mon Dec 19 23:55:24 2016 -0800 @@ -7763,7 +7763,7 @@ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \ -sys/param.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ +sys/param.h sys/random.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ diff -r a721bf7dda97 -r 31df7d9863f3 configure.ac --- a/configure.ac Tue Dec 20 09:59:47 2016 +0900 +++ b/configure.ac Mon Dec 19 23:55:24 2016 -0800 @@ -2019,7 +2019,7 @@ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \ -sys/param.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ +sys/param.h sys/random.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ diff -r a721bf7dda97 -r 31df7d9863f3 pyconfig.h.in --- a/pyconfig.h.in Tue Dec 20 09:59:47 2016 +0900 +++ b/pyconfig.h.in Mon Dec 19 23:55:24 2016 -0800 @@ -1036,6 +1036,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_POLL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RANDOM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_RESOURCE_H/benjamin@python.org