[Python-checkins] [2.7] Fix line breaks added after hyphens by blurb. (GH-7052)

Serhiy Storchaka webhook-mailer at python.org
Tue May 22 07:55:55 EDT 2018


https://github.com/python/cpython/commit/6c58f7f4b1b9783d4f3b1c4f31fd4fe8a845ee1f
commit: 6c58f7f4b1b9783d4f3b1c4f31fd4fe8a845ee1f
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018-05-22T14:55:52+03:00
summary:

[2.7] Fix line breaks added after hyphens by blurb. (GH-7052)

files:
M Misc/NEWS.d/2.6a1.rst
M Misc/NEWS.d/2.6a2.rst
M Misc/NEWS.d/2.7.11rc1.rst
M Misc/NEWS.d/2.7.13rc1.rst
M Misc/NEWS.d/2.7.14rc1.rst
M Misc/NEWS.d/2.7.15rc1.rst
M Misc/NEWS.d/2.7.2rc1.rst
M Misc/NEWS.d/2.7.4rc1.rst
M Misc/NEWS.d/2.7.5.rst
M Misc/NEWS.d/2.7.9rc1.rst
M Misc/NEWS.d/2.7a1.rst
M Misc/NEWS.d/2.7a2.rst
M Misc/NEWS.d/2.7b1.rst
M Misc/NEWS.d/2.7b2.rst
M Misc/NEWS.d/2.7rc1.rst

diff --git a/Misc/NEWS.d/2.6a1.rst b/Misc/NEWS.d/2.6a1.rst
index 8edf052299fc..058d8c4d6a1e 100644
--- a/Misc/NEWS.d/2.6a1.rst
+++ b/Misc/NEWS.d/2.6a1.rst
@@ -562,8 +562,8 @@ shifts from ints to longs.
 .. nonce: mFw2O5
 .. section: Core and Builtins
 
-Tuple's tp_repr did not take into account the possibility of having a self-
-referential tuple, which is possible from C code.  Nor did object's tp_str
+Tuple's tp_repr did not take into account the possibility of having a
+self-referential tuple, which is possible from C code.  Nor did object's tp_str
 consider that a type's tp_str could do something that could lead to an
 inifinite recursion. Py_ReprEnter() and Py_EnterRecursiveCall(),
 respectively, fixed the issues.
@@ -1592,8 +1592,8 @@ fix a bug to avoid FileHandler throwing an exception in flush().
 .. section: Library
 
 distutils' build command now uses different build directory when building
-extension modules against versions of Python compiled with ``--with-
-pydebug``.
+extension modules against versions of Python compiled with
+``--with-pydebug``.
 
 ..
 
@@ -2070,8 +2070,8 @@ with --with-system-ffi.
 .. nonce: MPohFL
 .. section: Library
 
-ctypes now does work on OS X when Python is built with --disable-toolbox-
-glue.
+ctypes now does work on OS X when Python is built with
+``--disable-toolbox-glue``.
 
 ..
 
@@ -5142,8 +5142,8 @@ platform.
 .. nonce: bwAdWN
 .. section: Build
 
-don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS returned by python-
-config if Python was built with --enable-shared because that prevented the
+don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS returned by
+python-config if Python was built with --enable-shared because that prevented the
 shared library from being used.
 
 ..
diff --git a/Misc/NEWS.d/2.6a2.rst b/Misc/NEWS.d/2.6a2.rst
index fe6cd26fdb1d..f7c6641f4e15 100644
--- a/Misc/NEWS.d/2.6a2.rst
+++ b/Misc/NEWS.d/2.6a2.rst
@@ -83,8 +83,8 @@ add Py3k warning for buffer().
 With narrow Unicode builds, the unicode escape sequence \Uxxxxxxxx did not
 accept values outside the Basic Multilingual Plane.  This affected raw
 unicode literals and the 'raw-unicode-escape' codec.  Now UTF-16 surrogates
-are generated in this case, like normal unicode literals and the 'unicode-
-escape' codec.
+are generated in this case, like normal unicode literals and the
+'unicode-escape' codec.
 
 ..
 
@@ -370,8 +370,8 @@ Add triangular distribution to the random module
 .. nonce: pMUClw
 .. section: Library
 
-urllib2's auth handler now allows single-quoted realms in the WWW-
-Authenticate header.
+urllib2's auth handler now allows single-quoted realms in the
+WWW-Authenticate header.
 
 ..
 
diff --git a/Misc/NEWS.d/2.7.11rc1.rst b/Misc/NEWS.d/2.7.11rc1.rst
index f995ed0aff1e..bba31329dedd 100644
--- a/Misc/NEWS.d/2.7.11rc1.rst
+++ b/Misc/NEWS.d/2.7.11rc1.rst
@@ -522,8 +522,8 @@ tarfile now tolerates number fields consisting of only whitespace.
 .. nonce: aAbWbQ
 .. section: Library
 
-Restore semantic round-trip correctness in tokenize/untokenize for tab-
-indented blocks.
+Restore semantic round-trip correctness in tokenize/untokenize for
+tab-indented blocks.
 
 ..
 
@@ -866,8 +866,8 @@ them a 'sheet'.  Patch by Mark Roseman.
 .. section: IDLE
 
 Enhance the initial html viewer now used for Idle Help. * Properly indent
-fixed-pitch text (patch by Mark Roseman). * Give code snippet a very Sphinx-
-like light blueish-gray background. * Re-use initial width and height set by
+fixed-pitch text (patch by Mark Roseman). * Give code snippet a very
+Sphinx-like light blueish-gray background. * Re-use initial width and height set by
 users for shell and editor. * When the Table of Contents (TOC) menu is used,
 put the section header at the top of the screen.
 
diff --git a/Misc/NEWS.d/2.7.13rc1.rst b/Misc/NEWS.d/2.7.13rc1.rst
index 26ffeea2b378..6bef454bcbe1 100644
--- a/Misc/NEWS.d/2.7.13rc1.rst
+++ b/Misc/NEWS.d/2.7.13rc1.rst
@@ -44,8 +44,8 @@ C-inherited Cython classes).
 .. nonce: RYbEGH
 .. section: Core and Builtins
 
-Extra slash no longer added to sys.path components in case of empty compile-
-time PYTHONPATH components.
+Extra slash no longer added to sys.path components in case of empty
+compile-time PYTHONPATH components.
 
 ..
 
@@ -373,8 +373,8 @@ Fixed support of default root window in the Tix module.
 
 When parsing HTTP header fields, if an invalid line is encountered, skip it
 and continue parsing.  Previously, no more header fields were parsed, which
-could lead to fields for HTTP framing like Content-Length and Transfer-
-Encoding being overlooked.
+could lead to fields for HTTP framing like Content-Length and
+Transfer-Encoding being overlooked.
 
 ..
 
@@ -935,9 +935,9 @@ Fix clean target in freeze makefile (patch by Lisa Roach)
 .. section: Build
 
 Cause lack of llvm-profdata tool when using clang as required for PGO
-linking to be a configure time error rather than make time when --with-
-optimizations is enabled.  Also improve our ability to find the llvm-
-profdata tool on MacOS and some Linuxes.
+linking to be a configure time error rather than make time when
+``--with-optimizations`` is enabled.  Also improve our ability to find the
+llvm-profdata tool on MacOS and some Linuxes.
 
 ..
 
diff --git a/Misc/NEWS.d/2.7.14rc1.rst b/Misc/NEWS.d/2.7.14rc1.rst
index 462c03a9fc3f..cc74f22cef5f 100644
--- a/Misc/NEWS.d/2.7.14rc1.rst
+++ b/Misc/NEWS.d/2.7.14rc1.rst
@@ -66,8 +66,8 @@ LF. Patch by Dong-hee Na.
 .. nonce: -zJ7d8
 .. section: Library
 
-multiprocessing.Queue.get() with a timeout now polls its reader in non-
-blocking mode if it succeeded to aquire the lock but the acquire took longer
+multiprocessing.Queue.get() with a timeout now polls its reader in
+non-blocking mode if it succeeded to aquire the lock but the acquire took longer
 than the timeout.
 
 ..
diff --git a/Misc/NEWS.d/2.7.15rc1.rst b/Misc/NEWS.d/2.7.15rc1.rst
index 1835bd1dfad6..a01bfd6b8f53 100644
--- a/Misc/NEWS.d/2.7.15rc1.rst
+++ b/Misc/NEWS.d/2.7.15rc1.rst
@@ -56,8 +56,8 @@ Upgrade expat copy from 2.2.0 to 2.2.1 to get fixes of multiple security
 vulnerabilities including: CVE-2017-9233 (External entity infinite loop
 DoS), CVE-2016-9063 (Integer overflow, re-fix), CVE-2016-0718 (Fix
 regression bugs from 2.2.0's fix to CVE-2016-0718) and CVE-2012-0876
-(Counter hash flooding with SipHash). Note: the CVE-2016-5300 (Use os-
-specific entropy sources like getrandom) doesn't impact Python, since Python
+(Counter hash flooding with SipHash). Note: the CVE-2016-5300 (Use
+os-specific entropy sources like getrandom) doesn't impact Python, since Python
 already gets entropy from the OS to set the expat secret using
 ``XML_SetHashSalt()``.
 
@@ -1329,8 +1329,8 @@ documentation. Patch by Matthias Bussonnier.
 
 Rewrite Comparisons section in the Expressions chapter of the language
 reference. Some of the details of comparing mixed types were incorrect or
-ambiguous. Added default behaviour and consistency suggestions for user-
-defined classes. Based on patch from Andy Maier.
+ambiguous. Added default behaviour and consistency suggestions for
+user-defined classes. Based on patch from Andy Maier.
 
 ..
 
@@ -1493,8 +1493,8 @@ Fix -Wint-in-bool-context warnings in PyMem_MALLOC and PyMem_REALLOC macros
 .. section: Build
 
 Prevent unnecessary rebuilding of Python during ``make test``, ``make
-install`` and some other make targets when configured with ``--enable-
-optimizations``.
+install`` and some other make targets when configured with
+``--enable-optimizations``.
 
 ..
 
diff --git a/Misc/NEWS.d/2.7.2rc1.rst b/Misc/NEWS.d/2.7.2rc1.rst
index 0b6f7c02d216..8d55be5702a9 100644
--- a/Misc/NEWS.d/2.7.2rc1.rst
+++ b/Misc/NEWS.d/2.7.2rc1.rst
@@ -26,8 +26,8 @@ propagated.
 .. nonce: rUvlec
 .. section: Core and Builtins
 
-Fix input() if it is interrupted by CTRL+d and then CTRL+c, clear the end-
-of-file indicator after CTRL+d.
+Fix input() if it is interrupted by CTRL+d and then CTRL+c, clear the
+end-of-file indicator after CTRL+d.
 
 ..
 
@@ -799,8 +799,8 @@ Allow mmap() to work on file sizes and offsets larger than 4GB, even on
 .. nonce: JAYw4l
 .. section: Library
 
-In WeakSet, do not raise TypeErrors when testing for membership of non-
-weakrefable objects.
+In WeakSet, do not raise TypeErrors when testing for membership of
+non-weakrefable objects.
 
 ..
 
@@ -886,8 +886,8 @@ FSTAT.
 .. nonce: xpdEg8
 .. section: Library
 
-mmap should not segfault when a file is mapped using 0 as length and a non-
-zero offset, and an attempt to read past the end of file is made (IndexError
+mmap should not segfault when a file is mapped using 0 as length and a
+non-zero offset, and an attempt to read past the end of file is made (IndexError
 is raised instead).  Patch by Ross Lagerwall.
 
 ..
@@ -1480,8 +1480,8 @@ includes a link to the installed documentation.
 .. nonce: BN3sYU
 .. section: Build
 
-Allow Mac OS X installer builds to again work on 10.5 with the system-
-provided Python.
+Allow Mac OS X installer builds to again work on 10.5 with the
+system-provided Python.
 
 ..
 
diff --git a/Misc/NEWS.d/2.7.4rc1.rst b/Misc/NEWS.d/2.7.4rc1.rst
index bb0bd5f94813..d0c615ba362b 100644
--- a/Misc/NEWS.d/2.7.4rc1.rst
+++ b/Misc/NEWS.d/2.7.4rc1.rst
@@ -1396,8 +1396,8 @@ subprocess.Popen.wait().
 .. nonce: 9Mn07O
 .. section: Library
 
-Fix a bug where zlib.decompressobj().flush() might try to access previously-
-freed memory. Patch by Serhiy Storchaka.
+Fix a bug where zlib.decompressobj().flush() might try to access
+previously-freed memory. Patch by Serhiy Storchaka.
 
 ..
 
@@ -1678,8 +1678,8 @@ Bohuslav Kabrda.
 .. nonce: 9gGqPw
 .. section: Library
 
-In cmath and math modules, add workaround for platforms whose system-
-supplied log1p function doesn't respect signs of zeros.
+In cmath and math modules, add workaround for platforms whose
+system-supplied log1p function doesn't respect signs of zeros.
 
 ..
 
@@ -2441,8 +2441,8 @@ require an argument again.
 .. section: Library
 
 OS X Xcode 4 - improve support for universal extension modules In
-particular, fix extension module build failures when trying to use 32-bit-
-only installer Pythons on systems with Xcode 4 (currently OS X 10.8, 10.7,
+particular, fix extension module build failures when trying to use
+32-bit-only installer Pythons on systems with Xcode 4 (currently OS X 10.8, 10.7,
 and optionally 10.6). * Backport 3.3.0 fixes to 2.7 branch (for release in
 2.7.4) * Since Xcode 4 removes ppc support, extension module builds now
 check for ppc compiler support and by default remove ppc and   ppc64 archs
diff --git a/Misc/NEWS.d/2.7.5.rst b/Misc/NEWS.d/2.7.5.rst
index f2093128ba93..9cd483e8a3bb 100644
--- a/Misc/NEWS.d/2.7.5.rst
+++ b/Misc/NEWS.d/2.7.5.rst
@@ -246,8 +246,8 @@ module.  Patch by Nickolai Zeldovich.
 .. nonce: E6rcrn
 .. section: Library
 
-Add to webbrowser's browser list: xdg-open, gvfs-open, www-browser, x-www-
-browser, chromium browsers, iceweasel, iceape.
+Add to webbrowser's browser list: xdg-open, gvfs-open, www-browser,
+x-www-browser, chromium browsers, iceweasel, iceape.
 
 ..
 
diff --git a/Misc/NEWS.d/2.7.9rc1.rst b/Misc/NEWS.d/2.7.9rc1.rst
index 45782bd9e576..fb58165221f0 100644
--- a/Misc/NEWS.d/2.7.9rc1.rst
+++ b/Misc/NEWS.d/2.7.9rc1.rst
@@ -1050,8 +1050,8 @@ special message when and only when there are failures.
 .. nonce: KAl7aO
 .. section: Build
 
-Prevent possible segfaults and other random failures of python --generate-
-posix-vars in pybuilddir.txt build target.
+Prevent possible segfaults and other random failures of python
+``--generate-posix-vars`` in pybuilddir.txt build target.
 
 ..
 
diff --git a/Misc/NEWS.d/2.7a1.rst b/Misc/NEWS.d/2.7a1.rst
index 5d0f99c623af..e2a28e0543e7 100644
--- a/Misc/NEWS.d/2.7a1.rst
+++ b/Misc/NEWS.d/2.7a1.rst
@@ -92,8 +92,8 @@ within Python are now correctly rounded.  Places these conversions occur
 include: str for floats and complex numbers; the float and complex
 constructors; old-style and new-style numeric formatting; serialization and
 deserialization of floats and complex numbers using marshal, pickle and
-json; parsing of float and imaginary literals in Python code; Decimal-to-
-float conversion.
+json; parsing of float and imaginary literals in Python code;
+Decimal-to-float conversion.
 
 The conversions use a Python-adapted version of David Gay's well-known
 dtoa.c, providing correctly-rounded strtod and dtoa C functions.  This code
@@ -5647,8 +5647,8 @@ trailing 0 in the version number.
 .. nonce: c2vdqn
 .. section: Tests
 
-Moved tests involving loading tk from Lib/test/test_tcl to Lib/lib-
-tk/test/test_tkinter/test_loadtk. With this, these tests demonstrate the
+Moved tests involving loading tk from Lib/test/test_tcl to
+Lib/lib-tk/test/test_tkinter/test_loadtk. With this, these tests demonstrate the
 same behaviour as test_ttkguionly (and now also test_tk) which is to skip
 the tests if DISPLAY is defined but can't be used.
 
diff --git a/Misc/NEWS.d/2.7a2.rst b/Misc/NEWS.d/2.7a2.rst
index fa1308116864..d453e96f8e8a 100644
--- a/Misc/NEWS.d/2.7a2.rst
+++ b/Misc/NEWS.d/2.7a2.rst
@@ -314,8 +314,8 @@ logging: Fix bug in Unicode encoding fallback.
 .. nonce: oAWtv2
 .. section: Library
 
-Fixed IMAP4_SSL hang when the IMAP server response is missing proper end-of-
-line termination.
+Fixed IMAP4_SSL hang when the IMAP server response is missing proper
+end-of-line termination.
 
 ..
 
diff --git a/Misc/NEWS.d/2.7b1.rst b/Misc/NEWS.d/2.7b1.rst
index cfa710ed8c55..9e096ecaa581 100644
--- a/Misc/NEWS.d/2.7b1.rst
+++ b/Misc/NEWS.d/2.7b1.rst
@@ -60,8 +60,8 @@ Raise a TypeError when trying to delete a T_STRING_INPLACE struct member.
 .. nonce: ZEBSAJ
 .. section: Core and Builtins
 
-Issue a PendingDeprecationWarning if object.__format__ is called with a non-
-empty format string. This is an effort to future-proof user code. If a
+Issue a PendingDeprecationWarning if object.__format__ is called with a
+non-empty format string. This is an effort to future-proof user code. If a
 derived class does not currently implement __format__ but later adds its own
 __format__, it would most likely break user code that had supplied a format
 string. This will be changed to a DeprecationWarning in Python 3.3 and it
@@ -201,8 +201,8 @@ the specification of rich comparisons.
 .. nonce: nshtA2
 .. section: Library
 
-The functools module also adds cmp_to_key() as a tool to transition old-
-style comparison functions to new-style key-functions.
+The functools module also adds cmp_to_key() as a tool to transition
+old-style comparison functions to new-style key-functions.
 
 ..
 
diff --git a/Misc/NEWS.d/2.7b2.rst b/Misc/NEWS.d/2.7b2.rst
index caa336b7427e..acc395bd1384 100644
--- a/Misc/NEWS.d/2.7b2.rst
+++ b/Misc/NEWS.d/2.7b2.rst
@@ -13,8 +13,8 @@ Run Clang 2.7's static analyzer for ``Objects/`` and ``Python/``.
 .. nonce: 6FLjC9
 .. section: Core and Builtins
 
-Fix inconsistency in range function argument processing: any non-float non-
-integer argument is now converted to an integer (if possible) using its
+Fix inconsistency in range function argument processing: any non-float
+non-integer argument is now converted to an integer (if possible) using its
 __int__ method.  Previously, only small arguments were treated this way;
 larger arguments (those whose __int__ was outside the range of a C long)
 would produce a TypeError.
diff --git a/Misc/NEWS.d/2.7rc1.rst b/Misc/NEWS.d/2.7rc1.rst
index 1984c09a6e85..18578b5037ed 100644
--- a/Misc/NEWS.d/2.7rc1.rst
+++ b/Misc/NEWS.d/2.7rc1.rst
@@ -98,8 +98,8 @@ in a framework build on MacOSX 10.5 or earlier.
 
 A new C API function, :cfunc:`PySys_SetArgvEx`, allows embedders of the
 interpreter to set sys.argv without also modifying sys.path.  This helps fix
-`CVE-2008-5983 <http://cve.mitre.org/cgi-
-bin/cvename.cgi?name=CVE-2008-5983>`_.
+`CVE-2008-5983
+<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5983>`_.
 
 ..
 



More information about the Python-checkins mailing list