Commit Graph

53202 Commits

Author SHA1 Message Date
Benjamin Peterson 332503db07 merge 3.2 2012-01-03 16:48:14 -06:00
Benjamin Peterson 199808b796 merge 3.2 2012-01-03 16:30:47 -06:00
Benjamin Peterson c095956ca5 merge 3.2 2012-01-03 16:26:34 -06:00
Antoine Pitrou f3ac50b778 Merge 2012-01-03 22:50:16 +01:00
Antoine Pitrou 72aeec35a1 Issue #13636: Weak ciphers are now disabled by default in the ssl module
(except when SSLv2 is explicitly asked for).
2012-01-03 22:49:08 +01:00
Sandro Tosi 9b5626d52c merge with 3.2 2012-01-03 22:47:28 +01:00
Sandro Tosi 5c91242f88 merge with 3.2 2012-01-03 18:37:46 +01:00
Eli Bendersky 74c503b40d use io.SEEK_* constants instead of os.SEEK_* where an IO stream is seeked, leaving the os.SEEK_* constants only for os.lseek, as documented 2012-01-03 06:26:13 +02:00
Antoine Pitrou c041ab6c7d Mock the rename failure a bit better 2012-01-02 19:18:02 +01:00
Benjamin Peterson 5e458f520c also decref the right thing 2012-01-02 10:12:13 -06:00
Benjamin Peterson 4c13a4a352 ready the correct string 2012-01-02 09:07:38 -06:00
Benjamin Peterson 02ffa08990 merge heads 2012-01-02 09:00:38 -06:00
Benjamin Peterson 22a29708fd fix some possible refleaks from PyUnicode_READY error conditions 2012-01-02 09:00:30 -06:00
Charles-François Natali 42663334cd Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by
Vilmos Nebehaj.
2012-01-02 15:57:30 +01:00
Nadeem Vawda dc9dd0d340 Add note on memory usage to LZMACompressor doc. 2012-01-02 02:24:20 +02:00
Benjamin Peterson 9ca3ffac94 == -1 is convention 2012-01-01 16:04:29 -06:00
Benjamin Peterson e157cf1012 make switch more robust 2012-01-01 15:56:20 -06:00
Sandro Tosi 9912b395c3 merge with 3.2 2012-01-01 22:53:29 +01:00
Sandro Tosi a56ee04536 Issue #13640: add application/vnd.apple.mpegurl MIME type; (partial) patch by Hiroaki Kawai 2012-01-01 18:34:29 +01:00
Sandro Tosi 35e0275e59 merge with 3.2 2012-01-01 18:05:06 +01:00
Sandro Tosi 245537a84d merge with 3.2 2012-01-01 12:56:04 +01:00
Sandro Tosi bc25dcf3f3 merge with 3.2 2012-01-01 12:17:36 +01:00
Ned Deily 49890c06b6 merge 3.2 2012-01-01 01:10:35 -08:00
Benjamin Peterson a174577f55 merge 3.2 2011-12-31 22:43:01 -06:00
Sandro Tosi 8df168cc7b merge with 3.2 2011-12-31 19:03:30 +01:00
Sandro Tosi eb90caa48d fix Exemples/Examples typo; thanks to Ori Livneh from docs@ 2011-12-31 12:59:08 +01:00
Eli Bendersky ca6b7a1a73 Some formatting & grammar fixes for the multiprocessing doc 2011-12-31 07:22:27 +02:00
Benjamin Peterson 4032802eb6 merge 3.2 2011-12-30 23:09:20 -06:00
Antoine Pitrou 5e8767c764 Fix no-op tests in importlib. 2011-12-30 21:26:08 +01:00
Benjamin Peterson 88cb2cafe9 merge 3.2 2011-12-30 13:47:49 -06:00
Benjamin Peterson f51d36a743 evidently some buildbots don't have python 3 installed 2011-12-29 12:07:21 -06:00
Benjamin Peterson 9b9c708de1 merge heads 2011-12-29 12:04:28 -06:00
Benjamin Peterson 3ab85886d6 run AST toolchain on python3 2011-12-29 12:03:55 -06:00
Antoine Pitrou 78091e63d6 Issue #12715: Add an optional symlinks argument to shutil functions (copyfile, copymode, copystat, copy, copy2).
When that parameter is true, symlinks aren't dereferenced and the operation
instead acts on the symlink itself (or creates one, if relevant).

Patch by Hynek Schlawack.
2011-12-29 18:54:15 +01:00
Benjamin Peterson d2f1db5355 merge heads 2011-12-28 12:01:51 -06:00
Benjamin Peterson 2199227be4 fix weird indentation 2011-12-28 12:01:31 -06:00
Jason R. Coombs bbb0803924 Limit test scope to those platforms that can save the target filenames. Reference #11638. 2011-12-28 10:45:08 -05:00
Benjamin Peterson 70069fcd4b don't fail if CLOEXEC doesn't exist 2011-12-27 16:52:20 -06:00
Benjamin Peterson 83251c1ecd try to always use the old API 2011-12-27 16:01:21 -06:00
Benjamin Peterson 95c16629d3 fix for old kernels which don't have epoll_create1 2011-12-27 15:36:32 -06:00
Benjamin Peterson a5f6f2aba3 merge 3.2 2011-12-27 15:17:15 -06:00
Benjamin Peterson 2fb9ae9dfc add a flags parameter to select.epoll 2011-12-27 15:15:41 -06:00
Jason R. Coombs e7437a7cb3 Ported some test cases from 2.7 for #11638 2011-12-26 12:17:01 -05:00
Georg Brandl 1e66f56d09 merge with 3.2 2011-12-25 19:03:22 +01:00
Sandro Tosi 54af1ba326 merge with 3.2 2011-12-25 17:26:09 +01:00
Sandro Tosi 2d0e48b6fd merge with 3.2 2011-12-25 17:14:28 +01:00
Sandro Tosi e837b46b89 merge with 3.2 2011-12-25 17:07:38 +01:00
Sandro Tosi 53dd1065ae merge with 3.2 2011-12-25 11:44:55 +01:00
Sandro Tosi c386c1a59f merge with 3.2 2011-12-25 11:27:51 +01:00
Sandro Tosi 91d9152919 merge with 3.2 2011-12-24 23:13:39 +01:00