From: Larry Hastings <larry@hastings.org>
Date: Thu, 19 Jul 2018 12:10:12 +0000 (-0700)
Subject: PyDoc and blurb updates for 3.4.9rc1.
X-Git-Tag: v3.4.9rc1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a6c8e9959c215c90b8fb0d4effa78689814a3d9;p=thirdparty%2FPython%2Fcpython.git

PyDoc and blurb updates for 3.4.9rc1.
---

diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 4f63977a5666..5ef36c9d2e94 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Tue Jan 23 04:24:01 2018
+# Autogenerated by Sphinx on Thu Jul 19 05:09:06 2018
 topics = {'assert': '\n'
            'The "assert" statement\n'
            '**********************\n'
diff --git a/Misc/NEWS.d/3.4.9rc1.rst b/Misc/NEWS.d/3.4.9rc1.rst
new file mode 100644
index 000000000000..d7e5886c197e
--- /dev/null
+++ b/Misc/NEWS.d/3.4.9rc1.rst
@@ -0,0 +1,19 @@
+.. bpo: 33001
+.. date: 2018-03-05-10-09-51
+.. nonce: elj4Aa
+.. release date: 2018-07-19
+.. section: Security
+
+Minimal fix to prevent buffer overrun in os.symlink on Windows
+
+..
+
+.. bpo: 32981
+.. date: 2018-03-02-10-24-52
+.. nonce: O_qDyj
+.. section: Security
+
+Regexes in difflib and poplib were vulnerable to catastrophic backtracking.
+These regexes formed potential DOS vectors (REDOS). They have been
+refactored. This resolves CVE-2018-1060 and CVE-2018-1061. Patch by Jamie
+Davis.
diff --git a/Misc/NEWS.d/next/Security/2018-03-02-10-24-52.bpo-32981.O_qDyj.rst b/Misc/NEWS.d/next/Security/2018-03-02-10-24-52.bpo-32981.O_qDyj.rst
deleted file mode 100644
index 9ebabb44f91e..000000000000
--- a/Misc/NEWS.d/next/Security/2018-03-02-10-24-52.bpo-32981.O_qDyj.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Regexes in difflib and poplib were vulnerable to catastrophic backtracking.
-These regexes formed potential DOS vectors (REDOS). They have been
-refactored. This resolves CVE-2018-1060 and CVE-2018-1061.
-Patch by Jamie Davis.
diff --git a/Misc/NEWS.d/next/Security/2018-03-05-10-09-51.bpo-33001.elj4Aa.rst b/Misc/NEWS.d/next/Security/2018-03-05-10-09-51.bpo-33001.elj4Aa.rst
deleted file mode 100644
index 2acbac9e1af6..000000000000
--- a/Misc/NEWS.d/next/Security/2018-03-05-10-09-51.bpo-33001.elj4Aa.rst
+++ /dev/null
@@ -1 +0,0 @@
-Minimal fix to prevent buffer overrun in os.symlink on Windows