[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

Tue Mar 18 07:48:02 CET 2014

http://hg.python.org/cpython/rev/b31441753abc
changeset: 89842:b31441753abc
parent: 89840:c9905e802042
parent: 89841:f8dbec87dbfe
user: Georg Brandl <georg at python.org>
date: Tue Mar 18 07:47:35 2014 +0100
summary:
 merge with 3.4
files:
 Doc/library/compileall.rst | 3 ++-
 Doc/tools/sphinxext/susp-ignored.csv | 5 -----
 2 files changed, 2 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
@@ -20,7 +20,8 @@
 
 .. program:: compileall
 
-.. cmdoption:: [directory|file]...
+.. cmdoption:: directory ...
+ file ...
 
 Positional arguments are files to compile or directories that contain
 source files, traversed recursively. If no argument is given, behave as if
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -276,10 +276,5 @@
 whatsnew/3.2,,:gz,">>> with tarfile.open(name='myarchive.tar.gz', mode='w:gz') as tf:"
 whatsnew/3.2,,:location,zope9-location = ${zope9:location}
 whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf
-whatsnew/changelog,,:platform,:platform:
 whatsnew/changelog,,:gz,": TarFile opened with external fileobj and ""w:gz"" mode didn't"
-whatsnew/changelog,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused"
-whatsnew/changelog,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""."
 whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as"
-whatsnew/changelog,,:password,user:password
-whatsnew/changelog,,:gz,w:gz
-- 
Repository URL: http://hg.python.org/cpython
