merge with 3.3

This commit is contained in:
Georg Brandl 2014-02-10 22:11:21 +01:00
commit d8413bab22
6 changed files with 43 additions and 5 deletions

View file

@ -282,3 +282,4 @@ whatsnew/changelog,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised Unic
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

1 c-api/arg :ref PyArg_ParseTuple(args, "O|O:ref", &object, &callback)
282 whatsnew/changelog :: : Fix FTP tests for IPv6, bind to "::1" instead of "localhost".
283 whatsnew/changelog :: : Use "127.0.0.1" or "::1" instead of "localhost" as much as
284 whatsnew/changelog :password user:password
285 whatsnew/changelog :gz w:gz