summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Issue #12012: ssl.PROTOCOL_SSLv2 becomes optionalVictor Stinner2011-05-085-36/+60
| | | | | | | OpenSSL is now compiled with OPENSSL_NO_SSL2 defined (without the SSLv2 protocol) on Debian: fix the ssl module on Debian Testing and Debian Sid. Optimize also ssl.get_protocol_name(): speed does matter!
* merge 3.2Benjamin Peterson2011-05-081-2/+3
|\
| * merge 3.1Benjamin Peterson2011-05-081-2/+3
| |\
| | * put import_fresh_module in __all__Benjamin Peterson2011-05-081-0/+1
| | |
* | | Refactor buggy test to correctly use the msg argument of assertRaises.Ezio Melotti2011-05-081-9/+4
| | |
* | | Merge with 3.2.Ezio Melotti2011-05-081-2/+2
|\ \ \ | |/ /
| * | Merge with 3.1.Ezio Melotti2011-05-081-1/+1
| |\ \ | | |/
| | * Add back Misc/NEWS entry that got lost during merge, and fix a couple of ↵Ezio Melotti2011-05-081-3/+5
| | | | | | | | | | | | other things.
* | | Issue #8407: Remove debug code from test_signalVictor Stinner2011-05-081-37/+10
| | | | | | | | | | | | I don't think that we still need it.
* | | Issue #8407: The signal handler writes the signal number as a single byteVictor Stinner2011-05-085-5/+35
| | | | | | | | | | | | | | | instead of a nul byte into the wakeup file descriptor. So it is possible to wait more than one signal and know which signals were raised.
* | | Issue #8407: Add pthread_kill(), sigpending() and sigwait() functions to theVictor Stinner2011-05-079-42/+287
| | | | | | | | | | | | signal module.
* | | MergeAntoine Pitrou2011-05-070-0/+0
|\ \ \ | |/ /
| * | MergeAntoine Pitrou2011-05-070-0/+0
| |\ \ | | |/
| | * MergeAntoine Pitrou2011-05-072-1/+10
| | |\
| | | * mergeGiampaolo Rodola'2011-05-072-1/+10
| | | |\
| * | | \ MergeAntoine Pitrou2011-05-074-2/+15
| |\ \ \ \
* | \ \ \ \ MergeAntoine Pitrou2011-05-073-1/+21
|\ \ \ \ \ \
| * \ \ \ \ \ merge with 3.2Giampaolo Rodola'2011-05-073-1/+21
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | merge with 3.1Giampaolo Rodola'2011-05-073-1/+21
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | #12002 - ftplib's abort() method raises TypeErrorGiampaolo Rodola'2011-05-073-1/+12
| | | | | | |
* | | | | | | Merge: Issue #11927: SMTP_SSL now uses port 465 by default as documented.Antoine Pitrou2011-05-074-2/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge: Issue #11927: SMTP_SSL now uses port 465 by default as documented.Antoine Pitrou2011-05-074-2/+15
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch by ↵Antoine Pitrou2011-05-074-2/+15
| | | |/ | | |/| | | | | | | | | Kasun Herath.
* | | | #5421: merge with 3.2.Ezio Melotti2011-05-071-0/+44
|\ \ \ \ | |/ / /
| * | | #5421: merge with 3.1.Ezio Melotti2011-05-071-0/+44
| |\ \ \ | | |/ /
| | * | #5421: add tests.Ezio Melotti2011-05-071-0/+30
| | | |
* | | | reverting 9688977ef567 committed by accidentGiampaolo Rodola'2011-05-071-9/+9
| | | |
* | | | Closed resource leak in SysLogHandler.Vinay Sajip2011-05-072-31/+28
| | | |
* | | | #12017: merge with 3.2.Ezio Melotti2011-05-073-4/+29
|\ \ \ \ | |/ / /
| * | | #12017: merge with 3.1.Ezio Melotti2011-05-073-4/+30
| |\ \ \ | | |/ /
| | * | #12017: Fix segfault in json.loads() while decoding highly-nested objects ↵Ezio Melotti2011-05-073-2/+28
| | | | | | | | | | | | | | | | using the C accelerations.
* | | | test_ftplib.py: change client default timeout from 10 to 2. Hanging for 10 ↵Giampaolo Rodola'2011-05-071-9/+9
| | | | | | | | | | | | | | | | seconds is way too much when we expect a server response which never comes in.
* | | | merge headsGiampaolo Rodola'2011-05-071-5/+6
|\ \ \ \
| * | | | Changed where socket close is called on connection failure.Vinay Sajip2011-05-071-5/+6
| | | | |
* | | | | test_ftplib.py: change client default timeout from 10 to 2. Hanging for 10 ↵Giampaolo Rodola'2011-05-071-9/+9
|/ / / / | | | | | | | | | | | | seconds is way too much when we expect a server response which never comes in.
* | | | #11072- applying http://bugs.python.org/review/11072/show suggestionsGiampaolo Rodola'2011-05-072-12/+15
| | | |
* | | | Merge.Vinay Sajip2011-05-071-0/+1
|\ \ \ \
| * \ \ \ Merge: Fix potential resource leak in test_mmap.Nadeem Vawda2011-05-071-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge: Fix potential resource leak in test_mmap.Nadeem Vawda2011-05-071-0/+1
| | |\ \ \ | | | |/ /
| | | * | Fix potential resource leak in test_mmap.Nadeem Vawda2011-05-071-0/+1
| | | | |
* | | | | Close socket on connection failure.Vinay Sajip2011-05-071-0/+3
|/ / / /
* | | | Merge: #11277: Fix tests - crash will not trigger if the file is closed and ↵Nadeem Vawda2011-05-071-14/+12
|\ \ \ \ | |/ / / | | | | | | | | reopened.
| * | | Merge: #11277: Fix tests - crash will not trigger if the file is closed and ↵Nadeem Vawda2011-05-071-14/+12
| |\ \ \ | | |/ / | | | | | | | | reopened.
| | * | Issue #11277: Fix tests - crash will not trigger if the file is closed and ↵Nadeem Vawda2011-05-071-14/+12
| | | | | | | | | | | | | | | | reopened.
* | | | Merge: #11277: Add tests for mmap crash when using large sparse files on OS X.Nadeem Vawda2011-05-071-26/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Also, reduce code duplication in LargeMmapTests. Original patch by Steffen Daode Nurpmeso.
| * | | Merge: #11277: Add tests for mmap crash when using large sparse files on OS X.Nadeem Vawda2011-05-071-26/+31
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Also, reduce code duplication in LargeMmapTests. Original patch by Steffen Daode Nurpmeso.
| | * | Issue #11277: Add tests for mmap crash when using large sparse files on OS X.Nadeem Vawda2011-05-071-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | Also, reduce code duplication in LargeMmapTests. Original patch by Steffen Daode Nurpmeso.
* | | | _PyImport_LoadDynamicModule() encodes the module name explicitly to ASCIIVictor Stinner2011-05-071-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | The name must be encodable to ASCII because dynamic module must have a function called "PyInit_NAME", they are written in C, and the C language doesn't accept non-ASCII identifiers.
* | | | faulthandler: dump all threads by defaultVictor Stinner2011-05-074-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Set the default value of all_threads arguments to True * Py_FatalError() dumps all threads, instead of only the current thread Dump only the current thread is not reliable. In some cases, Python is unable to retrieve the state of the current thread and so is unable to dump the traceback. faulthandler keeps a reference to the interpreter and so is always able to dump the traceback of all threads.
* | | | faulthandler: save/restore errno in the two signal handlersVictor Stinner2011-05-071-0/+4
| | | |