diff options
| author | Ned Deily <nad@python.org> | 2016-10-11 00:53:33 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2016-10-11 00:53:33 (GMT) |
| commit | 4d80a8a9165bea1acb542c49cc37d32551284f5b (patch) | |
| tree | 6b046e84de2425caa8f7069046e93fd49b69b927 | |
| parent | ec1f28a63c24b81137de1f1b5a45fc80d9f1fdfa (diff) | |
| parent | a4f45bb0c4e5c899d6ec793f423ce16f631b867e (diff) | |
| download | cpython-4d80a8a9165bea1acb542c49cc37d32551284f5b.zip cpython-4d80a8a9165bea1acb542c49cc37d32551284f5b.tar.gz cpython-4d80a8a9165bea1acb542c49cc37d32551284f5b.tar.bz2 | |
Merge 3.6 releasing branch
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | Include/patchlevel.h | 4 | ||||
| -rw-r--r-- | Lib/pydoc_data/topics.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 16 | ||||
| -rw-r--r-- | README | 2 |
5 files changed, 20 insertions, 5 deletions
@@ -171,3 +171,4 @@ cc15d736d860303b9da90d43cd32db39bab048df v3.5.0rc2 f3edf13dc339b8942ae6b309771ab197dd8ce6fa v3.6.0a3 017cf260936b444788c9b671d195b7bfd83dbd25 v3.6.0a4 5b0ca4ed5e2f0669d76ece7ef975c544580f12b4 v3.6.0b1 +b9fadc7d1c3f9c3c77f32f35afbe1a1cc38070e6 v3.6.0b2 diff --git a/Include/patchlevel.h b/Include/patchlevel.h index b623508..29da489 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -20,10 +20,10 @@ #define PY_MINOR_VERSION 6 #define PY_MICRO_VERSION 0 #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_BETA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_SERIAL 2 /* Version as a string */ -#define PY_VERSION "3.6.0b1+" +#define PY_VERSION "3.6.0b2+" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py index 3579484..aaf2ce6 100644 --- a/Lib/pydoc_data/topics.py +++ b/Lib/pydoc_data/topics.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Autogenerated by Sphinx on Mon Sep 12 10:47:11 2016 +# Autogenerated by Sphinx on Mon Oct 10 15:59:17 2016 topics = {'assert': '\n' 'The "assert" statement\n' '**********************\n' @@ -2,7 +2,7 @@ Python News +++++++++++ -What's New in Python 3.6.0 beta 2 +What's New in Python 3.6.0 beta 3 ================================= *Release date: XXXX-XX-XX* @@ -10,6 +10,18 @@ What's New in Python 3.6.0 beta 2 Core and Builtins ----------------- +Library +------- + + +What's New in Python 3.6.0 beta 2 +================================= + +*Release date: 2016-10-10* + +Core and Builtins +----------------- + - Issue #28183: Optimize and cleanup dict iteration. - Issue #26081: Added C implementation of asyncio.Future. @@ -266,6 +278,7 @@ Tests - Issue #28217: Adds _testconsole module to test console input. + What's New in Python 3.6.0 beta 1 ================================= @@ -1001,6 +1014,7 @@ Build - Issue #10910: Avoid C++ compilation errors on FreeBSD and OS X. Also update FreedBSD version checks for the original ctype UTF-8 workaround. + What's New in Python 3.6.0 alpha 3 ================================== @@ -1,4 +1,4 @@ -This is Python version 3.6.0 beta 1 +This is Python version 3.6.0 beta 2 =================================== Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, |