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

[yury.selivanov]

https://hg.python.org/cpython/rev/90e79bf21eac
changeset:   97811:90e79bf21eac
parent:      97809:a96cc32f8160
parent:      97810:a172a8035a93
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Wed Sep 09 09:32:17 2015 -0400
summary:
  Merge 3.5

files:
  Doc/library/compileall.rst |  9 +++------
  1 files changed, 3 insertions(+), 6 deletions(-)


diff --git a/Doc/library/compileall.rst b/Doc/library/compileall.rst
--- a/Doc/library/compileall.rst
+++ b/Doc/library/compileall.rst
@@ -88,12 +88,9 @@
    Added the ``-i``, ``-b`` and ``-h`` options.
 
 .. versionchanged:: 3.5
-
-   * Added the  ``-j`` and ``-r`` options.
-   * ``-q`` option was changed to a multilevel value.
-   * ``-qq`` option.
-   * ``-b`` will always produce a byte-code file ending in ``.pyc``,
-     never ``.pyo``.
+   Added the  ``-j``, ``-r``, and ``-qq`` options.  ``-q`` option
+   was changed to a multilevel value.  ``b`` will always produce a
+   byte-code file ending in ``.pyc``, never ``.pyo``.
 
 
 There is no command-line option to control the optimization level used by the

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