]> granicus.if.org Git - python/commitdiff
merge 3.6 (#28932)
authorBenjamin Peterson <benjamin@python.org>
Tue, 20 Dec 2016 07:55:24 +0000 (23:55 -0800)
committerBenjamin Peterson <benjamin@python.org>
Tue, 20 Dec 2016 07:55:24 +0000 (23:55 -0800)
1  2 
Misc/NEWS
configure
configure.ac
pyconfig.h.in

diff --cc Misc/NEWS
index 15bc0ed6a7bced6e0b8b0d60274c0a00749dab0a,cd1b6618d3755ef78a852c2e58329b81fbb1a523..24285d56a9e427f5ecd43b93c096f7141d86e6ec
+++ b/Misc/NEWS
@@@ -10,9 -10,8 +10,11 @@@ What's New in Python 3.7.0 alpha 
  Core and Builtins
  -----------------
  
 +- Issue #28927: bytes.fromhex() and bytearray.fromhex() now ignore all ASCII
 +  whitespace, not only spaces.  Patch by Robert Xiao.
 +
+ - Issue #28932: Do not include <sys/random.h> 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 --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc pyconfig.h.in
Simple merge