From 638f68c8bcab46070c73ba31181f484647785d0e Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
<31488909+miss-islington@users.noreply.github.com>
Date: Wed, 6 Dec 2017 12:12:44 -0800
Subject: [PATCH 1/4] Allows non-critical upload steps to fail (GH-4742)
(#4743)
(cherry picked from commit 9ab11b3a029fba36c1a7e869be87fb4f31ebcf24)
---
Tools/msi/uploadrelease.proj | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Tools/msi/uploadrelease.proj b/Tools/msi/uploadrelease.proj
index 881b825e107..96b99a4ff63 100644
--- a/Tools/msi/uploadrelease.proj
+++ b/Tools/msi/uploadrelease.proj
@@ -52,11 +52,11 @@
-
+
-
+
-
+
From 898a3e4901b3b6de9b540e18faa457a6ac3e49bb Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
<31488909+miss-islington@users.noreply.github.com>
Date: Wed, 13 Dec 2017 00:59:01 -0800
Subject: [PATCH 2/4] bpo-32284: Fix documentation of BinaryIO and TextIO
(GH-4832) (#4833)
(cherry picked from commit c3e070f84931c847d1b35e7fb36aa71edd6215f6)
---
Doc/library/typing.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index d28a5d54843..9c4777ac2fe 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -774,9 +774,9 @@ The module defines the following classes, functions and decorators:
Wrapper namespace for I/O stream types.
- This defines the generic type ``IO[AnyStr]`` and aliases ``TextIO``
- and ``BinaryIO`` for respectively ``IO[str]`` and ``IO[bytes]``.
- These represent the types of I/O streams such as returned by
+ This defines the generic type ``IO[AnyStr]`` and subclasses ``TextIO``
+ and ``BinaryIO``, deriving from ``IO[str]`` and ``IO[bytes]``,
+ respectively. These represent the types of I/O streams such as returned by
:func:`open`.
These types are also accessible directly as ``typing.IO``,
From c7d7f7729edb634b4f2e62084bc39baa8ff29c3c Mon Sep 17 00:00:00 2001
From: Ned Deily
Date: Mon, 18 Dec 2017 23:50:55 -0500
Subject: [PATCH 3/4] Update NEWS for 3.6.4 final
---
Misc/NEWS.d/3.6.4.rst | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 Misc/NEWS.d/3.6.4.rst
diff --git a/Misc/NEWS.d/3.6.4.rst b/Misc/NEWS.d/3.6.4.rst
new file mode 100644
index 00000000000..cf23101035c
--- /dev/null
+++ b/Misc/NEWS.d/3.6.4.rst
@@ -0,0 +1,8 @@
+.. bpo: 0
+.. date: 2017-12-18
+.. no changes: True
+.. nonce: qH8KPG
+.. release date: 2017-12-18
+.. section: Library
+
+There were no new code changes in version 3.6.4 since v3.6.4rc1.
From d48ecebad5ac78a1783e09b0d32c211d9754edf4 Mon Sep 17 00:00:00 2001
From: Ned Deily
Date: Mon, 18 Dec 2017 23:53:56 -0500
Subject: [PATCH 4/4] Update to 3.6.4
---
Include/patchlevel.h | 6 +++---
README.rst | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 5fb1205ee66..e909bb240b8 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
#define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 6
#define PY_MICRO_VERSION 4
-#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL 1
+#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "3.6.4rc1"
+#define PY_VERSION "3.6.4"
/*--end constants--*/
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/README.rst b/README.rst
index b608dc8b52a..05c31da8f2a 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-This is Python version 3.6.4 candidate 1
-========================================
+This is Python version 3.6.4
+============================
.. image:: https://travis-ci.org/python/cpython.svg?branch=3.6
:alt: CPython build status on Travis CI