Commit Graph

87137 Commits

Author SHA1 Message Date
Benjamin Peterson 98e1b9158c merge 3.4 2014-11-03 21:06:07 -05:00
Benjamin Peterson 1ea070e561 test that keyfile can be None 2014-11-03 21:05:01 -05:00
Benjamin Peterson 4a358de34e context has been backported so fix versionchanged 2014-11-03 17:04:01 -05:00
Benjamin Peterson 678e11aa22 merge 3.4 2014-11-03 15:12:52 -05:00
Benjamin Peterson 8d2d5b9c59 merge 3.3 2014-11-03 15:12:06 -05:00
Benjamin Peterson 97751fa5c9 merge 3.2 2014-11-03 15:11:53 -05:00
Benjamin Peterson 863c962e68 move idna test domain to pythontest.net 2014-11-03 15:10:47 -05:00
Benjamin Peterson 1cca273669 merge 3.4 (#22417) 2014-11-03 14:36:48 -05:00
Benjamin Peterson 4ffb075271 PEP 476: enable HTTPS certificate verification by default (#22417)
Patch by Alex Gaynor with some modifications by me.
2014-11-03 14:29:33 -05:00
Serhiy Storchaka 2cb0e73a89 Issue #22775: Fixed unpickling of http.cookies.SimpleCookie with protocol 2
and above.  Patch by Tim Graham.
2014-11-02 22:19:56 +02:00
Serhiy Storchaka 8cf7c1cff0 Issue #22775: Fixed unpickling of http.cookies.SimpleCookie with protocol 2
and above.  Patch by Tim Graham.
2014-11-02 22:18:25 +02:00
Benjamin Peterson 030dbb91a9 merge 3.4 2014-11-02 13:19:15 -05:00
Benjamin Peterson a5c9c37dd5 wrap 2014-11-02 13:17:56 -05:00
Antoine Pitrou a14414dfe9 Merge heads 2014-11-02 18:42:41 +01:00
Antoine Pitrou 8a03896cac Issue #22335: Fix crash when trying to enlarge a bytearray to 0x7fffffff bytes on a 32-bit platform. 2014-11-02 18:41:56 +01:00
Antoine Pitrou cc23154d02 Issue #22335: Fix crash when trying to enlarge a bytearray to 0x7fffffff bytes on a 32-bit platform. 2014-11-02 18:40:09 +01:00
R David Murray c58e3a449b Merge asyncio doc English phrasing fix. 2014-11-02 12:33:37 -05:00
R David Murray 64f10d4f5e Reflow paragraph. 2014-11-02 12:32:26 -05:00
R David Murray 3ca68e77b8 Fix English phrasing. 2014-11-02 12:31:47 -05:00
Serhiy Storchaka 170af0e2db Null merge 2014-11-02 19:26:48 +02:00
Serhiy Storchaka bb019eb4c1 Merge heads 2014-11-02 19:26:28 +02:00
Serhiy Storchaka 58905e9ba2 Merge heads 2014-11-02 19:26:23 +02:00
Serhiy Storchaka c1ded29f8e Issue #22388: Unified the style of "Contributed by" sentences in What's New. 2014-11-02 19:22:02 +02:00
Serhiy Storchaka e5cf4868d3 Issue #22388: Unified the style of "Contributed by" sentences in What's New. 2014-11-02 19:18:52 +02:00
Ezio Melotti 6e2db04345 #22751: merge with 3.4. 2014-11-02 19:14:54 +02:00
Ezio Melotti 8b23f5cc7a #22751: fix test___all__ warning about modified environment in the tests. Patch by Michael Cetrulo. 2014-11-02 19:08:35 +02:00
Antoine Pitrou 07df6555c4 Fix test_urllib without the ssl module 2014-11-02 17:23:14 +01:00
Zachary Ware 740e1dcdc2 Issue #17896: Move Windows external lib sources from .. to externals. 2014-11-01 22:48:24 -05:00
Zachary Ware 4b2b1de0bd Issue #17896: Move Windows external lib sources from .. to externals. 2014-11-01 22:39:21 -05:00
Ned Deily 048345d417 Issue #22770: merge from 3.4 2014-11-01 19:33:25 -07:00
Ned Deily 91f01e175a Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
When running tests in subprocesses with the regrtest -j option, a bug
in Cocoa Tk can result in a Tcl segfault.  Avoid the problem by forcing
Tk to fully initialize as an OS X gui process before destroying the
Tcl instance and creating another. (Original patch by Serhiy Storchaka)
2014-11-01 19:29:22 -07:00
Zachary Ware e470d092cb Issue #17717: Pull NASM from svn.python.org for OpenSSL build. 2014-11-01 18:42:46 -05:00
Zachary Ware bac47773f1 Null merge with 3.4 2014-11-01 18:33:52 -05:00
Steve Dower f6c69e6cc9 #22734 marshal needs a lower stack depth for debug builds on Windows 2014-11-01 15:15:16 -07:00
Steve Dower 53683965aa #22732 ctypes tests don't set correct restype for intptr_t functions 2014-11-01 15:14:27 -07:00
Zachary Ware aa3ea7ee78 Issue #17717: Pull NASM from svn.python.org for OpenSSL build. 2014-11-01 17:11:08 -05:00
Steve Dower 86e9deb5aa #22731 test_capi test fails because of mismatched newlines 2014-11-01 15:11:05 -07:00
Vinay Sajip 1be0c61882 Closes #22776: Merged fix from 3.4. 2014-11-01 20:00:56 +00:00
Vinay Sajip c33a0cc61e Brought excluded code into the scope of a try block in SysLogHandler.emit(). 2014-11-01 19:58:47 +00:00
Ethan Furman 8be6fac103 standardize Enum docs by referring to 'special methods' instead of __dunder__ methods 2014-11-01 07:40:22 -07:00
Berker Peksag 8912270629 Issue #22665: Add missing get_terminal_size and SameFileError to shutil.__all__. 2014-11-01 11:05:36 +02:00
Berker Peksag 8083cd6c3b Issue #22665: Add missing get_terminal_size and SameFileError to shutil.__all__. 2014-11-01 11:04:06 +02:00
Berker Peksag 8f791d358b Issue #6623: Remove deprecated Netrc class in the ftplib module.
Patch by Matt Chaput.
2014-11-01 10:45:57 +02:00
Ethan Furman 8906f14a68 issue22780: update NotImplemented description 2014-10-31 16:48:41 -07:00
Georg Brandl b8fa289152 merge with 3.4 2014-10-31 13:13:09 +01:00
Georg Brandl e1d26f377e Closes #22772: fix __ifloordiv__ and __itruediv__ docstring. 2014-10-31 13:12:57 +01:00
Serhiy Storchaka 8f60c0e7f4 Null merge 2014-10-31 12:40:11 +02:00
Serhiy Storchaka b1847e7541 Issue #17381: Fixed handling of case-insensitive ranges in regular expressions. 2014-10-31 12:37:50 +02:00
Serhiy Storchaka 4b8f8949b4 Issue #17381: Fixed handling of case-insensitive ranges in regular expressions.
Added new opcode RANGE_IGNORE.
2014-10-31 12:36:56 +02:00
Georg Brandl 455de40a6e merge with 3.4 2014-10-31 10:54:10 +01:00