[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/c8d66b13c2e7
changeset:   96305:c8d66b13c2e7
parent:      96303:5780ee2c18e1
parent:      96304:6d340bae6de1
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue May 26 21:40:35 2015 -0500
summary:
  Merge 3.5

files:
  Doc/whatsnew/3.5.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -253,13 +253,13 @@
 ---------------------------------
 
 :pep:`488` does away with the concept of ``.pyo`` files. This means that
-``.pyc`` files represent both unoptimized and optimized bytecode. To prevent
-the need to constantly regenerate bytecode files, ``.pyc`` files now have an
-optional ``opt-`` tag in their name when the bytecode is optimized. This has
-the side-effect of no more bytecode file name clashes when running under either
-``-O`` or ``-OO``, thus allowing unoptimized, ``-O``, and ``-OO`` bytecode files
-to all exist simultaneously. :func:`importlib.util.cache_from_source` has an
-updated API to help with this change.
+``.pyc`` files represent both unoptimized and optimized bytecode. To prevent the
+need to constantly regenerate bytecode files, ``.pyc`` files now have an
+optional ``opt-`` tag in their name when the bytecode is optimized. This has the
+side-effect of no more bytecode file name clashes when running under either
+``-O`` or ``-OO``. Consequently, bytecode files generated from ``-O``, and
+``-OO`` may now exist simultaneously. :func:`importlib.util.cache_from_source`
+has an updated API to help with this change.
 
 .. seealso::
 

-- 
Repository URL: https://hg.python.org/cpython