Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ed80db5

Browse files
committed
Merge 3.6.0a2 releasing branch into default
2 parents 1db314b + 8a43f72 commit ed80db5

5 files changed

Lines changed: 129 additions & 86 deletions

File tree

.hgtags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,3 +164,4 @@ cc15d736d860303b9da90d43cd32db39bab048df v3.5.0rc2
164164
37a07cee5969e6d3672583187a73cf636ff28e1b v3.5.1
165165
68feec6488b26327a85a634605dd28eca4daa5f1 v3.5.2rc1
166166
5896da372fb044e38595fb74495de1e1e7c8fb3c v3.6.0a1
167+
37889342355223e2fc1438de3dc7ffcd625c60f7 v3.6.0a2

Include/patchlevel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#define PY_MINOR_VERSION 6
2121
#define PY_MICRO_VERSION 0
2222
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA
23-
#define PY_RELEASE_SERIAL 1
23+
#define PY_RELEASE_SERIAL 2
2424

2525
/* Version as a string */
26-
#define PY_VERSION "3.6.0a1+"
26+
#define PY_VERSION "3.6.0a2+"
2727
/*--end constants--*/
2828

2929
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

Lib/pydoc_data/topics.py

Lines changed: 122 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Autogenerated by Sphinx on Mon May 16 13:41:38 2016
2+
# Autogenerated by Sphinx on Mon Jun 13 16:49:58 2016
33
topics = {'assert': '\n'
44
'The "assert" statement\n'
55
'**********************\n'
@@ -47,12 +47,12 @@
4747
'to\n'
4848
'modify attributes or items of mutable objects:\n'
4949
'\n'
50-
' assignment_stmt ::= (target_list "=")+ (expression_list | '
51-
'yield_expression)\n'
50+
' assignment_stmt ::= (target_list "=")+ (starred_expression '
51+
'| yield_expression)\n'
5252
' target_list ::= target ("," target)* [","]\n'
5353
' target ::= identifier\n'
54-
' | "(" target_list ")"\n'
55-
' | "[" target_list "]"\n'
54+
' | "(" [target_list] ")"\n'
55+
' | "[" [target_list] "]"\n'
5656
' | attributeref\n'
5757
' | subscription\n'
5858
' | slicing\n'
@@ -89,35 +89,42 @@
8989
'parentheses or square brackets, is recursively defined as '
9090
'follows.\n'
9191
'\n'
92-
'* If the target list is a single target: The object is '
93-
'assigned to\n'
94-
' that target.\n'
92+
'* If the target list is empty: The object must also be an '
93+
'empty\n'
94+
' iterable.\n'
9595
'\n'
96-
'* If the target list is a comma-separated list of targets: '
97-
'The\n'
98-
' object must be an iterable with the same number of items as '
99-
'there\n'
100-
' are targets in the target list, and the items are assigned, '
101-
'from\n'
102-
' left to right, to the corresponding targets.\n'
96+
'* If the target list is a single target in parentheses: The '
97+
'object\n'
98+
' is assigned to that target.\n'
10399
'\n'
104-
' * If the target list contains one target prefixed with an\n'
105-
' asterisk, called a "starred" target: The object must be a '
106-
'sequence\n'
107-
' with at least as many items as there are targets in the '
100+
'* If the target list is a comma-separated list of targets, or '
101+
'a\n'
102+
' single target in square brackets: The object must be an '
103+
'iterable\n'
104+
' with the same number of items as there are targets in the '
108105
'target\n'
109-
' list, minus one. The first items of the sequence are '
110-
'assigned,\n'
111-
' from left to right, to the targets before the starred '
112-
'target. The\n'
113-
' final items of the sequence are assigned to the targets '
114-
'after the\n'
115-
' starred target. A list of the remaining items in the '
116-
'sequence is\n'
117-
' then assigned to the starred target (the list can be '
118-
'empty).\n'
106+
' list, and the items are assigned, from left to right, to '
107+
'the\n'
108+
' corresponding targets.\n'
119109
'\n'
120-
' * Else: The object must be a sequence with the same number '
110+
' * If the target list contains one target prefixed with an\n'
111+
' asterisk, called a "starred" target: The object must be '
112+
'an\n'
113+
' iterable with at least as many items as there are targets '
114+
'in the\n'
115+
' target list, minus one. The first items of the iterable '
116+
'are\n'
117+
' assigned, from left to right, to the targets before the '
118+
'starred\n'
119+
' target. The final items of the iterable are assigned to '
120+
'the\n'
121+
' targets after the starred target. A list of the remaining '
122+
'items\n'
123+
' in the iterable is then assigned to the starred target '
124+
'(the list\n'
125+
' can be empty).\n'
126+
'\n'
127+
' * Else: The object must be an iterable with the same number '
121128
'of\n'
122129
' items as there are targets in the target list, and the '
123130
'items are\n'
@@ -149,14 +156,6 @@
149156
'destructor (if it\n'
150157
' has one) to be called.\n'
151158
'\n'
152-
'* If the target is a target list enclosed in parentheses or '
153-
'in\n'
154-
' square brackets: The object must be an iterable with the '
155-
'same number\n'
156-
' of items as there are targets in the target list, and its '
157-
'items are\n'
158-
' assigned, from left to right, to the corresponding targets.\n'
159-
'\n'
160159
'* If the target is an attribute reference: The primary '
161160
'expression in\n'
162161
' the reference is evaluated. It should yield an object with\n'
@@ -1148,18 +1147,18 @@
11481147
' call ::= primary "(" [argument_list [","] | '
11491148
'comprehension] ")"\n'
11501149
' argument_list ::= positional_arguments ["," '
1151-
'keyword_arguments]\n'
1152-
' ["," "*" expression] ["," '
1153-
'keyword_arguments]\n'
1154-
' ["," "**" expression]\n'
1155-
' | keyword_arguments ["," "*" expression]\n'
1156-
' ["," keyword_arguments] ["," "**" '
1157-
'expression]\n'
1158-
' | "*" expression ["," keyword_arguments] ["," '
1159-
'"**" expression]\n'
1160-
' | "**" expression\n'
1161-
' positional_arguments ::= expression ("," expression)*\n'
1162-
' keyword_arguments ::= keyword_item ("," keyword_item)*\n'
1150+
'starred_and_keywords]\n'
1151+
' ["," keywords_arguments]\n'
1152+
' | starred_and_keywords ["," '
1153+
'keywords_arguments]\n'
1154+
' | keywords_arguments\n'
1155+
' positional_arguments ::= ["*"] expression ("," ["*"] '
1156+
'expression)*\n'
1157+
' starred_and_keywords ::= ("*" expression | keyword_item)\n'
1158+
' ("," "*" expression | "," '
1159+
'keyword_item)*\n'
1160+
' keywords_arguments ::= (keyword_item | "**" expression)\n'
1161+
' ("," keyword_item | "**" expression)*\n'
11631162
' keyword_item ::= identifier "=" expression\n'
11641163
'\n'
11651164
'An optional trailing comma may be present after the positional and\n'
@@ -1235,20 +1234,21 @@
12351234
'\n'
12361235
'If the syntax "*expression" appears in the function call, '
12371236
'"expression"\n'
1238-
'must evaluate to an iterable. Elements from this iterable are '
1239-
'treated\n'
1240-
'as if they were additional positional arguments; if there are\n'
1241-
'positional arguments *x1*, ..., *xN*, and "expression" evaluates to '
1242-
'a\n'
1243-
'sequence *y1*, ..., *yM*, this is equivalent to a call with M+N\n'
1244-
'positional arguments *x1*, ..., *xN*, *y1*, ..., *yM*.\n'
1237+
'must evaluate to an *iterable*. Elements from these iterables are\n'
1238+
'treated as if they were additional positional arguments. For the '
1239+
'call\n'
1240+
'"f(x1, x2, *y, x3, x4)", if *y* evaluates to a sequence *y1*, ...,\n'
1241+
'*yM*, this is equivalent to a call with M+4 positional arguments '
1242+
'*x1*,\n'
1243+
'*x2*, *y1*, ..., *yM*, *x3*, *x4*.\n'
12451244
'\n'
12461245
'A consequence of this is that although the "*expression" syntax '
12471246
'may\n'
1248-
'appear *after* some keyword arguments, it is processed *before* '
1249-
'the\n'
1250-
'keyword arguments (and the "**expression" argument, if any -- see\n'
1251-
'below). So:\n'
1247+
'appear *after* explicit keyword arguments, it is processed '
1248+
'*before*\n'
1249+
'the keyword arguments (and any "**expression" arguments -- see '
1250+
'below).\n'
1251+
'So:\n'
12521252
'\n'
12531253
' >>> def f(a, b):\n'
12541254
' ... print(a, b)\n'
@@ -1269,16 +1269,25 @@
12691269
'arise.\n'
12701270
'\n'
12711271
'If the syntax "**expression" appears in the function call,\n'
1272-
'"expression" must evaluate to a mapping, the contents of which are\n'
1273-
'treated as additional keyword arguments. In the case of a keyword\n'
1274-
'appearing in both "expression" and as an explicit keyword argument, '
1275-
'a\n'
1276-
'"TypeError" exception is raised.\n'
1272+
'"expression" must evaluate to a *mapping*, the contents of which '
1273+
'are\n'
1274+
'treated as additional keyword arguments. If a keyword is already\n'
1275+
'present (as an explicit keyword argument, or from another '
1276+
'unpacking),\n'
1277+
'a "TypeError" exception is raised.\n'
12771278
'\n'
12781279
'Formal parameters using the syntax "*identifier" or "**identifier"\n'
12791280
'cannot be used as positional argument slots or as keyword argument\n'
12801281
'names.\n'
12811282
'\n'
1283+
'Changed in version 3.5: Function calls accept any number of "*" '
1284+
'and\n'
1285+
'"**" unpackings, positional arguments may follow iterable '
1286+
'unpackings\n'
1287+
'("*"), and keyword arguments may follow dictionary unpackings '
1288+
'("**").\n'
1289+
'Originally proposed by **PEP 448**.\n'
1290+
'\n'
12821291
'A call always returns some value, possibly "None", unless it raises '
12831292
'an\n'
12841293
'exception. How this value is computed depends on the type of the\n'
@@ -1324,7 +1333,7 @@
13241333
'\n'
13251334
' classdef ::= [decorators] "class" classname [inheritance] ":" '
13261335
'suite\n'
1327-
' inheritance ::= "(" [parameter_list] ")"\n'
1336+
' inheritance ::= "(" [argument_list] ")"\n'
13281337
' classname ::= identifier\n'
13291338
'\n'
13301339
'A class definition is an executable statement. The inheritance '
@@ -2261,7 +2270,7 @@
22612270
'[parameter_list] ")" ["->" expression] ":" suite\n'
22622271
' decorators ::= decorator+\n'
22632272
' decorator ::= "@" dotted_name ["(" '
2264-
'[parameter_list [","]] ")"] NEWLINE\n'
2273+
'[argument_list [","]] ")"] NEWLINE\n'
22652274
' dotted_name ::= identifier ("." identifier)*\n'
22662275
' parameter_list ::= defparameter ("," defparameter)* '
22672276
'["," [parameter_list_starargs]]\n'
@@ -2426,7 +2435,7 @@
24262435
'\n'
24272436
' classdef ::= [decorators] "class" classname [inheritance] '
24282437
'":" suite\n'
2429-
' inheritance ::= "(" [parameter_list] ")"\n'
2438+
' inheritance ::= "(" [argument_list] ")"\n'
24302439
' classname ::= identifier\n'
24312440
'\n'
24322441
'A class definition is an executable statement. The inheritance '
@@ -2563,7 +2572,7 @@
25632572
'Is semantically equivalent to:\n'
25642573
'\n'
25652574
' iter = (ITER)\n'
2566-
' iter = await type(iter).__aiter__(iter)\n'
2575+
' iter = type(iter).__aiter__(iter)\n'
25672576
' running = True\n'
25682577
' while running:\n'
25692578
' try:\n'
@@ -3889,7 +3898,7 @@
38893898
' dict_display ::= "{" [key_datum_list | dict_comprehension] '
38903899
'"}"\n'
38913900
' key_datum_list ::= key_datum ("," key_datum)* [","]\n'
3892-
' key_datum ::= expression ":" expression\n'
3901+
' key_datum ::= expression ":" expression | "**" or_expr\n'
38933902
' dict_comprehension ::= expression ":" expression comp_for\n'
38943903
'\n'
38953904
'A dictionary display yields a new dictionary object.\n'
@@ -3903,6 +3912,14 @@
39033912
'value\n'
39043913
'for that key will be the last one given.\n'
39053914
'\n'
3915+
'A double asterisk "**" denotes *dictionary unpacking*. Its operand\n'
3916+
'must be a *mapping*. Each mapping item is added to the new\n'
3917+
'dictionary. Later values replace values already set by earlier\n'
3918+
'key/datum pairs and earlier dictionary unpackings.\n'
3919+
'\n'
3920+
'New in version 3.5: Unpacking into dictionary displays, originally\n'
3921+
'proposed by **PEP 448**.\n'
3922+
'\n'
39063923
'A dict comprehension, in contrast to list and set comprehensions,\n'
39073924
'needs two expressions separated with a colon followed by the usual\n'
39083925
'"for" and "if" clauses. When the comprehension is run, the '
@@ -4384,13 +4401,30 @@
43844401
'Expression lists\n'
43854402
'****************\n'
43864403
'\n'
4387-
' expression_list ::= expression ( "," expression )* [","]\n'
4404+
' expression_list ::= expression ( "," expression )* [","]\n'
4405+
' starred_list ::= starred_item ( "," starred_item )* '
4406+
'[","]\n'
4407+
' starred_expression ::= expression | ( starred_item "," )* '
4408+
'[starred_item]\n'
4409+
' starred_item ::= expression | "*" or_expr\n'
43884410
'\n'
4389-
'An expression list containing at least one comma yields a '
4390-
'tuple. The\n'
4391-
'length of the tuple is the number of expressions in the list. '
4392-
'The\n'
4393-
'expressions are evaluated from left to right.\n'
4411+
'Except when part of a list or set display, an expression list\n'
4412+
'containing at least one comma yields a tuple. The length of '
4413+
'the tuple\n'
4414+
'is the number of expressions in the list. The expressions are\n'
4415+
'evaluated from left to right.\n'
4416+
'\n'
4417+
'An asterisk "*" denotes *iterable unpacking*. Its operand must '
4418+
'be an\n'
4419+
'*iterable*. The iterable is expanded into a sequence of items, '
4420+
'which\n'
4421+
'are included in the new tuple, list, or set, at the site of '
4422+
'the\n'
4423+
'unpacking.\n'
4424+
'\n'
4425+
'New in version 3.5: Iterable unpacking in expression lists, '
4426+
'originally\n'
4427+
'proposed by **PEP 448**.\n'
43944428
'\n'
43954429
'The trailing comma is required only to create a single tuple '
43964430
'(a.k.a. a\n'
@@ -5220,7 +5254,7 @@
52205254
'[parameter_list] ")" ["->" expression] ":" suite\n'
52215255
' decorators ::= decorator+\n'
52225256
' decorator ::= "@" dotted_name ["(" '
5223-
'[parameter_list [","]] ")"] NEWLINE\n'
5257+
'[argument_list [","]] ")"] NEWLINE\n'
52245258
' dotted_name ::= identifier ("." identifier)*\n'
52255259
' parameter_list ::= defparameter ("," defparameter)* '
52265260
'["," [parameter_list_starargs]]\n'
@@ -5682,7 +5716,7 @@
56825716
'the\n'
56835717
'two steps are carried out separately for each clause, just as '
56845718
'though\n'
5685-
'the clauses had been separated out into individiual import '
5719+
'the clauses had been separated out into individual import '
56865720
'statements.\n'
56875721
'\n'
56885722
'The details of the first step, finding and loading modules are\n'
@@ -6016,7 +6050,7 @@
60166050
'in\n'
60176051
'square brackets:\n'
60186052
'\n'
6019-
' list_display ::= "[" [expression_list | comprehension] "]"\n'
6053+
' list_display ::= "[" [starred_list | comprehension] "]"\n'
60206054
'\n'
60216055
'A list display yields a new list object, the contents being '
60226056
'specified\n'
@@ -8305,6 +8339,14 @@
83058339
'object is bound in the local namespace as the defined '
83068340
'class.\n'
83078341
'\n'
8342+
'When a new class is created by "type.__new__", the object '
8343+
'provided as\n'
8344+
'the namespace parameter is copied to a standard Python '
8345+
'dictionary and\n'
8346+
'the original object is discarded. The new copy becomes the '
8347+
'"__dict__"\n'
8348+
'attribute of the class object.\n'
8349+
'\n'
83088350
'See also:\n'
83098351
'\n'
83108352
' **PEP 3135** - New super\n'

Misc/NEWS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ What's New in Python 3.6.0 alpha 3
88
*Release date: XXXX-XX-XX*
99

1010
Library
11-
+++++++
11+
-------
1212

1313
- Issue #22636: Avoid shell injection problems with
1414
ctypes.util.find_library().
@@ -18,15 +18,15 @@ Library
1818
indexes.
1919

2020
IDLE
21-
++++
21+
----
2222

2323
- Issue #27310: Fix IDLE.app failure to launch on OS X due to vestigial import.
2424

2525

2626
What's New in Python 3.6.0 alpha 2
2727
==================================
2828

29-
*Release date: XXXX-XX-XX*
29+
*Release date: 2016-06-13*
3030

3131
Core and Builtins
3232
-----------------

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This is Python version 3.6.0 alpha 1
1+
This is Python version 3.6.0 alpha 2
22
====================================
33

44
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,

0 commit comments

Comments
 (0)