summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-07-05 11:17:43 -0700
committerNed Deily <nad@acm.org>2015-07-05 11:17:43 -0700
commitda2d51f97aaf630f5ad13aa004a6c5f0175ef780 (patch)
tree794eea12e50995f4fb3c22e0816f4f9186fe0d20
parentdc28d5a1986e88057bb44bfeff34296cf4c01f54 (diff)
parentab30353adbef3a3fdd54fb30856af8ff94f2c108 (diff)
downloadcpython-git-da2d51f97aaf630f5ad13aa004a6c5f0175ef780.tar.gz
merge 3.5.0b3 changes from 3.5
-rw-r--r--.hgtags1
-rw-r--r--Doc/tools/susp-ignored.csv3
-rw-r--r--Misc/NEWS6
3 files changed, 6 insertions, 4 deletions
diff --git a/.hgtags b/.hgtags
index f22a0281c7..ae615cf89e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -150,3 +150,4 @@ b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
413e0e0004f4f954331cb8122aa55fe208984955 v3.5.0a4
071fefbb5e3db770c6c19fba9994699f121b1cea v3.5.0b1
7a088af5615bf04024e9912068f4bd8f43ed3917 v3.5.0b2
+0035fcd9b9243ae52c2e830204fd9c1f7d528534 v3.5.0b3
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index 8432f78a8a..e44fc21a73 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -163,7 +163,6 @@ library/profile,,:lineno,filename:lineno(function)
library/pyexpat,,:elem1,<py:elem1 />
library/pyexpat,,:py,"xmlns:py = ""http://www.python.org/ns/"">"
library/smtplib,,:port,method must support that as well as a regular host:port
-library/socket,,::,"(10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))]"
library/socket,,::,'5aef:2b::8'
library/socket,,:can,"return (can_id, can_dlc, data[:can_dlc])"
library/socket,,:len,fds.fromstring(cmsg_data[:len(cmsg_data) - (len(cmsg_data) % fds.itemsize)])
@@ -290,3 +289,5 @@ library/zipapp,31,:main,"$ python -m zipapp myapp -m ""myapp:main"""
library/zipapp,82,:fn,"argument should have the form ""pkg.mod:fn"", where ""pkg.mod"" is a"
library/zipapp,155,:callable,"""pkg.module:callable"" and the archive will be run by importing"
library/stdtypes,3767,::,>>> m[::2].tolist()
+library/sys,1115,`,# `wrapper` creates a `wrap(coro)` coroutine:
+tutorial/venv,77,:c7b9645a6f35,"Python 3.4.3+ (3.4:c7b9645a6f35+, May 22 2015, 09:31:25)"
diff --git a/Misc/NEWS b/Misc/NEWS
index 4ac9924fbc..9e611ac5fa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,13 +21,15 @@ Library
What's New in Python 3.5.0 beta 4?
==================================
-*Release date: XXXX-XX-XX*
+Release date: 2015-07-26
Core and Builtins
-----------------
- Issue #24569: Make PEP 448 dictionary evaluation more consistent.
+- Issue #24407: Fix crash when dict is mutated while being updated.
+
Library
-------
@@ -64,8 +66,6 @@ Core and Builtins
- Issue #19235: Add new RecursionError exception. Patch by Georg Brandl.
-- Issue #24407: Fix crash when dict is mutated while being updated.
-
Library
-------