From: Georg Brandl <georg@python.org>
Date: Tue, 18 Mar 2014 06:47:35 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~2087
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f2350c6477d9bf0a7c7bc07966b58003e1d2edb;p=python

merge with 3.4
---

3f2350c6477d9bf0a7c7bc07966b58003e1d2edb
diff --cc Doc/tools/sphinxext/susp-ignored.csv
index f9d6bbfa57,1769023941..7acc79bd8a
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@@ -276,10 -276,9 +276,5 @@@ whatsnew/3.2,,:feed,>>> urllib.parse.ur
  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