Ezio Melotti
60480454bc
Merge with 3.2.
2011-05-09 04:00:47 +03:00
Ezio Melotti
74efb71871
Merge with 3.1.
2011-05-09 04:00:06 +03:00
Ezio Melotti
0ed8c6897c
Add a note to the str.find doc to suggest the use of the "in" operator.
2011-05-09 03:54:30 +03:00
Benjamin Peterson
eaee1385a0
note the point of having log2
2011-05-08 19:48:08 -05:00
Victor Stinner
6348f0ecdd
Close #12032 : Fix scripts/crlf.py for Python 3
2011-05-09 01:29:30 +02:00
Victor Stinner
fa0e3d52d6
Issue #11888 : Add log2 function to math module. Patch written by Mark
...
Dickinson.
2011-05-09 01:01:09 +02:00
Victor Stinner
3de49192aa
Issue #12012 : ssl.PROTOCOL_SSLv2 becomes optional
...
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!
2011-05-09 00:42:58 +02:00
Benjamin Peterson
3a0792da6e
merge 3.2
2011-05-08 15:35:09 -05:00
Benjamin Peterson
31dc3735a5
merge 3.1
2011-05-08 15:34:24 -05:00
Benjamin Peterson
262c5827a5
put import_fresh_module in __all__
2011-05-08 15:32:46 -05:00
Ezio Melotti
845f1526a3
Refactor buggy test to correctly use the msg argument of assertRaises.
2011-05-08 20:23:57 +03:00
Ezio Melotti
43432b84c3
Merge with 3.2.
2011-05-08 20:01:36 +03:00
Ezio Melotti
1a743741bf
Merge with 3.1.
2011-05-08 20:00:03 +03:00
Ezio Melotti
1c3fd58281
Add back Misc/NEWS entry that got lost during merge, and fix a couple of other things.
2011-05-08 19:58:08 +03:00
Victor Stinner
3a7f0f05c1
Issue #8407 : Remove debug code from test_signal
...
I don't think that we still need it.
2011-05-08 02:10:36 +02:00
Victor Stinner
d49b1f14de
Issue #8407 : The signal handler writes the signal number as a single byte
...
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.
2011-05-08 02:03:15 +02:00
Victor Stinner
b3e7219abf
Issue #8407 : Add pthread_kill(), sigpending() and sigwait() functions to the
...
signal module.
2011-05-08 01:46:11 +02:00
Antoine Pitrou
2c736bb38e
Merge
2011-05-07 19:48:40 +02:00
Antoine Pitrou
2407ce1a96
Merge
2011-05-07 19:48:18 +02:00
Antoine Pitrou
a8201f02dc
Merge
2011-05-07 19:47:47 +02:00
Antoine Pitrou
6ef5dfdb94
Merge
2011-05-07 19:47:24 +02:00
Antoine Pitrou
4d1cd0a0a0
Merge
2011-05-07 19:45:34 +02:00
Antoine Pitrou
d7f12f30e4
Merge: Issue #11927 : SMTP_SSL now uses port 465 by default as documented.
2011-05-07 19:42:39 +02:00
Antoine Pitrou
5bcc50c1b5
Merge: Issue #11927 : SMTP_SSL now uses port 465 by default as documented.
2011-05-07 19:41:33 +02:00
Antoine Pitrou
c1d520634a
Issue #11927 : SMTP_SSL now uses port 465 by default as documented. Patch by Kasun Herath.
2011-05-07 19:39:37 +02:00
Giampaolo Rodola'
fde86ff673
merge
2011-05-07 19:35:36 +02:00
Giampaolo Rodola'
ffc235cbbf
merge with 3.2
2011-05-07 19:11:06 +02:00
Giampaolo Rodola'
24befa87dc
merge with 3.1
2011-05-07 19:09:34 +02:00
Giampaolo Rodola'
0b5c21f9c9
#12002 - ftplib's abort() method raises TypeError
2011-05-07 19:03:47 +02:00
Ezio Melotti
8b7664d0b8
#5421 : merge with 3.2.
2011-05-07 19:51:47 +03:00
Ezio Melotti
4c1aebd88b
#5421 : merge with 3.1.
2011-05-07 19:50:28 +03:00
Ezio Melotti
63e4230c38
#5421 : add tests.
2011-05-07 19:47:48 +03:00
Giampaolo Rodola'
842e567530
reverting 9688977ef567 committed by accident
2011-05-07 18:47:31 +02:00
Vinay Sajip
fd28502fcf
Closed resource leak in SysLogHandler.
2011-05-07 17:01:22 +01:00
Ezio Melotti
9c18778695
#12017 : merge with 3.2.
2011-05-07 18:29:14 +03:00
Ezio Melotti
06383ee090
#12017 : merge with 3.1.
2011-05-07 18:15:34 +03:00
Giampaolo Rodola'
dbf0454082
test_ftplib.py: change client default timeout from 10 to 2. Hanging for 10 seconds is way too much when we expect a server response which never comes in.
2011-05-07 17:08:34 +02:00
Giampaolo Rodola'
e9514b877b
merge heads
2011-05-07 17:08:04 +02:00
Giampaolo Rodola'
b28e09421d
test_ftplib.py: change client default timeout from 10 to 2. Hanging for 10 seconds is way too much when we expect a server response which never comes in.
2011-05-07 17:02:21 +02:00
Ezio Melotti
362b95102f
#12017 : Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations.
2011-05-07 17:58:09 +03:00
Vinay Sajip
b37cd39202
Changed where socket close is called on connection failure.
2011-05-07 15:55:47 +01:00
Giampaolo Rodola'
a55efb3b6f
#11072- applying http://bugs.python.org/review/11072/show suggestions
2011-05-07 16:06:59 +02:00
Vinay Sajip
052a899d5a
Merge.
2011-05-07 13:44:50 +01:00
Vinay Sajip
2261b325ab
Close socket on connection failure.
2011-05-07 13:44:11 +01:00
Nadeem Vawda
da91d1892a
Merge: Fix potential resource leak in test_mmap.
2011-05-07 14:36:14 +02:00
Nadeem Vawda
b0b0579625
Merge: Fix potential resource leak in test_mmap.
2011-05-07 14:35:36 +02:00
Nadeem Vawda
7420b70240
Fix potential resource leak in test_mmap.
2011-05-07 14:35:05 +02:00
Nadeem Vawda
ce79230173
Merge: #11277 : Fix tests - crash will not trigger if the file is closed and reopened.
2011-05-07 14:17:27 +02:00
Nadeem Vawda
044dfadd1c
Merge: #11277 : Fix tests - crash will not trigger if the file is closed and reopened.
2011-05-07 14:16:50 +02:00
Nadeem Vawda
909f6d2fba
Issue #11277 : Fix tests - crash will not trigger if the file is closed and reopened.
2011-05-07 14:14:53 +02:00