Commit Graph

52765 Commits

Author SHA1 Message Date
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
Antoine Pitrou 8f85f907e3 Issue #13636: Weak ciphers are now disabled by default in the ssl module
(except when SSLv2 is explicitly asked for).
2012-01-03 22:46:48 +01:00
Sandro Tosi 753b79c073 Issue #6031: improve serve_forever() description 2012-01-03 22:35:54 +01:00
Sandro Tosi 5c91242f88 merge with 3.2 2012-01-03 18:37:46 +01:00
Sandro Tosi ea320abcae Issue #9349: add argparse.SUPPRESS to help doc 2012-01-03 18:37:03 +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
Charles-François Natali 366999a011 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by
Vilmos Nebehaj.
2012-01-02 15:47:29 +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 70efbefcc5 Issue #13594: various fixes to aifc module; patch by Oleg Plakhotnyuk 2012-01-01 22:53:08 +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 bdd5354700 Issue #13680: add lowecase compression type to write header; patch by Oleg Plakhotnyuk 2012-01-01 18:04:37 +01:00
Sandro Tosi 245537a84d merge with 3.2 2012-01-01 12:56:04 +01:00
Sandro Tosi da785fd527 Issue #13690: add re.DEBUG; patch by Filip Gruszczyński 2012-01-01 12:55:20 +01:00
Sandro Tosi bc25dcf3f3 merge with 3.2 2012-01-01 12:17:36 +01:00
Sandro Tosi b2794c842f Issue #13683: raise with no exception in scope throws a RuntimeError; fix by Ramchandra Apte 2012-01-01 12:17:15 +01:00
Ned Deily 49890c06b6 merge 3.2 2012-01-01 01:10:35 -08:00
Ned Deily 4391173778 Update copyright dates in Mac plists. 2012-01-01 01:09:19 -08:00
Benjamin Peterson a174577f55 merge 3.2 2011-12-31 22:43:01 -06:00
Benjamin Peterson c40d362a1c merge heads 2011-12-31 22:42:45 -06:00
Benjamin Peterson f606e682a4 add another year to glorious PSF IP 2011-12-31 22:42:26 -06:00
Sandro Tosi 8df168cc7b merge with 3.2 2011-12-31 19:03:30 +01:00
Sandro Tosi 1abde3628b fix some broken URLs 2011-12-31 18:46:50 +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
Eli Bendersky d08effe287 Some formatting & grammar fixes for the multiprocessing doc 2011-12-31 07:20:26 +02:00
Benjamin Peterson 4032802eb6 merge 3.2 2011-12-30 23:09:20 -06:00
Benjamin Peterson a6c4a10d4e indicate msg is an argument 2011-12-30 23:08:09 -06:00
Antoine Pitrou 5e8767c764 Fix no-op tests in importlib. 2011-12-30 21:26:08 +01:00
Antoine Pitrou 7c9907e565 Fix no-op tests in importlib. 2011-12-30 21:25:15 +01:00
Benjamin Peterson 88cb2cafe9 merge 3.2 2011-12-30 13:47:49 -06:00
Benjamin Peterson 79ed84c7f2 use booleans 2011-12-30 13:47:25 -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