Raymond Hettinger
334fdeed2b
merge
2011-05-02 11:03:37 -07:00
Raymond Hettinger
a5ac2ce982
Backport 3.3 fixes and cleans ups.
2011-05-02 11:02:13 -07:00
Alexander Belopolsky
4409493d73
Relax %Y test.
2011-05-02 13:48:09 -04:00
Alexander Belopolsky
66746cb222
Removed unused variable
2011-05-02 13:44:20 -04:00
Alexander Belopolsky
89da349b7b
Issue #11930 : Remove year >= 1000 limitation from datetime.strftime.
...
Patch by Victor Stinner.
2011-05-02 13:14:24 -04:00
Raymond Hettinger
9d8c3b7cef
dummy merge
2011-05-02 09:53:36 -07:00
Raymond Hettinger
81b9656989
Backport code cleanup for namedtuples.
2011-05-02 09:50:15 -07:00
Alexander Belopolsky
09a98a99cd
merge
2011-05-02 12:31:17 -04:00
Alexander Belopolsky
03163ac185
Issue #11930 : Remove deprecated time.accept2dyear.
2011-05-02 12:20:52 -04:00
Victor Stinner
72c53b5dcc
cleanup signalmodule.c: use PyModule_AddIntMacro()
2011-05-02 16:15:43 +02:00
Victor Stinner
59bec36b1c
(Merge 3.2) logging: don't define QueueListener if Python has no thread support
2011-05-02 16:14:16 +02:00
Victor Stinner
cafa2efedb
logging: don't define QueueListener if Python has no thread support
2011-05-02 16:11:28 +02:00
Vinay Sajip
714b8dc501
Improved thread interlocks in tests.
2011-05-02 14:43:00 +01:00
Vinay Sajip
314b92b26e
Updated docstrings.
2011-05-02 14:31:16 +01:00
R David Murray
477a6eb4a2
Merge: I was right, hardconding the localhost IP doesn't work in linux-vserver.
2011-05-02 08:48:00 -04:00
R David Murray
b912c5a004
I was right, hardconding the localhost IP doesn't work in linux-vserver.
2011-05-02 08:47:24 -04:00
Vinay Sajip
2265cf4c2e
Merge.
2011-05-02 13:18:21 +01:00
Vinay Sajip
7367d08838
Added tests to improve coverage.
2011-05-02 13:17:27 +01:00
Éric Araujo
f95f18048d
Merge 3.2
2011-05-02 13:33:14 +02:00
Éric Araujo
38cfe89665
Merge 3.1
2011-05-02 13:12:23 +02:00
Éric Araujo
cd6756d2ae
Branch merge
2011-05-02 13:10:36 +02:00
Éric Araujo
b79c234e1a
Add missing colon
2011-05-02 13:10:18 +02:00
Benjamin Peterson
0255973af6
merge 3.2
2011-05-01 20:24:59 -05:00
Benjamin Peterson
c704378987
merge 3.1
2011-05-01 20:24:40 -05:00
Raymond Hettinger
9b2fd32cc5
Fix spelling.
2011-05-01 18:14:49 -07:00
Victor Stinner
fadeeffe5b
(Merge 3.2) Issue #11277 : mmap.mmap() calls fcntl(fd, F_FULLFSYNC) on Mac OS X
...
to get around a mmap bug with sparse files. Patch written by Steffen Daode
Nurpmeso.
2011-05-02 01:14:55 +02:00
Victor Stinner
8108e96bc8
(Merge 3.1) Issue #11277 : mmap.mmap() calls fcntl(fd, F_FULLFSYNC) on Mac OS X
...
to get around a mmap bug with sparse files. Patch written by Steffen Daode
Nurpmeso.
2011-05-02 01:11:33 +02:00
Victor Stinner
a6cd0cf0f5
Issue #11277 : mmap calls fcntl(fd, F_FULLFSYNC) on Mac OS X to get around a
...
mmap bug with sparse files. Patch written by Steffen Daode Nurpmeso.
2011-05-02 01:05:37 +02:00
Benjamin Peterson
47583fa9b4
merge 3.2
2011-05-01 17:39:52 -05:00
Benjamin Peterson
cee01bf18f
merge 3.1
2011-05-01 17:39:40 -05:00
Benjamin Peterson
10116d40d8
note abcs of int and float ( closes #11977 )
2011-05-01 17:38:17 -05:00
Victor Stinner
d23820b7c9
(Merge 3.2) Issue #9756 : credit the author, Andreas Stührk (Trundle)
2011-05-01 23:48:41 +02:00
Victor Stinner
5cf93c6885
(Merge 3.1) Issue #9756 : credit the author, Andreas Stührk (Trundle)
2011-05-01 23:47:56 +02:00
Victor Stinner
13aaef53be
Issue #9756 : credit the author, Andreas Stührk (Trundle)
2011-05-01 23:46:48 +02:00
Victor Stinner
6a534e7e7b
(Merge 3.2) Issue #9756 : When calling a method descriptor or a slot wrapper
...
descriptor, the check of the object type doesn't read the __class__ attribute
anymore. Fix a crash if a class override its __class__ attribute (e.g. a proxy
of the str type).
2011-05-01 23:33:06 +02:00
Victor Stinner
d9561318d8
(Merge 3.1) Issue #9756 : When calling a method descriptor or a slot wrapper
...
descriptor, the check of the object type doesn't read the __class__ attribute
anymore. Fix a crash if a class override its __class__ attribute (e.g. a proxy
of the str type).
2011-05-01 23:31:36 +02:00
Victor Stinner
3249dec024
Issue #9756 : When calling a method descriptor or a slot wrapper descriptor, the
...
check of the object type doesn't read the __class__ attribute anymore. Fix a
crash if a class override its __class__ attribute (e.g. a proxy of the str
type).
2011-05-01 23:19:15 +02:00
Victor Stinner
571e8fda9b
regrtest: add the name of the failing test on a child error (-j option)
2011-05-01 22:57:43 +02:00
Georg Brandl
6c32b4a601
merge with 3.2
2011-05-01 22:37:46 +02:00
Georg Brandl
da623ed9f4
Split combined code/doctest code blocks in two blocks, to enable proper highlighting.
2011-05-01 22:37:23 +02:00
Georg Brandl
2cdee708e9
Split combined code/doctest code blocks in two blocks, to enable proper highlighting.
2011-05-01 22:34:31 +02:00
R David Murray
90c3fb6e76
Merge #11971 : fix man page; it's -OO not -O0
...
Patch by Lars Michelsen.
2011-05-01 11:15:01 -04:00
R David Murray
e97f14c1bb
Merge #11971 : fix man page; it's -OO not -O0
...
Patch by Lars Michelsen.
2011-05-01 11:14:31 -04:00
R David Murray
9c4f09d0f4
#11971 : fix man page; it's -OO not -O0
...
Patch by Lars Michelsen.
2011-05-01 11:13:56 -04:00
Éric Araujo
3bba57d596
Fix wording
2011-05-01 02:14:48 +02:00
Victor Stinner
c90e19dd3f
Close #11958 : Fix FTP tests for IPv6, bind to "::1" instead of "localhost".
...
Patch written by Charles-Francois Natali.
2011-05-01 01:23:03 +02:00
R David Murray
afbc8506a1
Merge #11883 : fix email examples by adding 'localhost' to SMTP constructor calls
2011-04-30 17:29:28 -04:00
R David Murray
361a7df323
Merge #11883 : fix email examples by adding 'localhost' to SMTP constructor calls
2011-04-30 17:29:08 -04:00
R David Murray
bb754b503c
#11883 : fix email examples by adding 'localhost' to SMTP constructor calls
2011-04-30 17:26:32 -04:00
R David Murray
d3f075a4c0
Merge #11883 : replace incorrect call to sendmail with correct call to send_message
2011-04-30 17:20:44 -04:00