Éric Araujo
de579d4359
Add a space to make json doc a bit more readable
2011-04-21 02:37:41 +02:00
Jesus Cea
f745d8be46
merge
2011-04-20 22:40:48 +02:00
Jesus Cea
f620754597
merge heads
2011-04-20 22:39:29 +02:00
Jesus Cea
7365accc20
merge heads
2011-04-20 22:38:26 +02:00
Jesus Cea
f299c51346
null merge
2011-04-20 22:31:34 +02:00
Jesus Cea
2fc8b87499
Port 5b607cd8c71b ( closes #11892 )
2011-04-20 22:26:57 +02:00
Raymond Hettinger
296d6d0cd6
Minor text rearrangement.
2011-04-20 13:08:40 -07:00
Raymond Hettinger
fc330aeb6f
Minor text rearrangement.
2011-04-20 13:03:49 -07:00
Jesus Cea
db26dff560
heads merging
2011-04-20 21:10:20 +02:00
Jesus Cea
ec81d41242
null merge
2011-04-20 21:00:40 +02:00
Ezio Melotti
af92842bf9
Use non-deprecated method name.
2011-04-20 21:56:21 +03:00
Jesus Cea
5ccd27841a
merge
2011-04-20 20:51:59 +02:00
Jesus Cea
c3ab577f34
merge
2011-04-20 20:51:09 +02:00
Jesus Cea
7124f5f7e8
MERGE: Up-port changeset 5cf8f6da8743 ( closes #11890 )
2011-04-20 20:32:52 +02:00
Ezio Melotti
861d27f4cf
Merge with 3.1.
2011-04-20 21:32:40 +03:00
Ezio Melotti
e402724912
Fix wrong function name. Noticed by Clive Darke.
2011-04-20 21:29:31 +03:00
Jesus Cea
1d4ae84e53
Up-port changeset 5cf8f6da8743 ( closes #11890 )
2011-04-20 20:24:57 +02:00
Éric Araujo
37e6c54ba1
Merge 3.1
2011-04-20 19:24:09 +02:00
Éric Araujo
6f205ed37e
Branch merge
2011-04-20 19:23:26 +02:00
Éric Araujo
5c1a0c969d
Fix argument name in reST doc to match the code
2011-04-20 19:11:12 +02:00
Éric Araujo
ad0790e573
Branch merge
2011-04-20 18:54:12 +02:00
Éric Araujo
f8e1b60799
Add docstring to dbm.open
2011-04-20 18:52:55 +02:00
Jesus Cea
6159ee3cf5
MERGE: startswith and endswith don't accept None as slice index. Patch by Torsten Becker. ( closes #11828 )
2011-04-20 17:42:50 +02:00
Jesus Cea
ac4515063c
startswith and endswith don't accept None as slice index. Patch by Torsten Becker. ( closes #11828 )
2011-04-20 17:09:23 +02:00
Raymond Hettinger
25458f155a
Issue #11875 : Alter the previous fix to work better with subclasses
2011-04-19 17:17:51 -07:00
Raymond Hettinger
d07eaf177c
Issue #11875 : Alter the previous fix to work better with subclasses
2011-04-19 17:17:23 -07:00
Ezio Melotti
a947abec6a
Merge with 3.1.
2011-04-19 23:23:47 +03:00
Ezio Melotti
8dfcab0885
Fix wrong number of functions noticed by Sandro Tosi.
2011-04-19 23:15:13 +03:00
Raymond Hettinger
111474452d
merge
2011-04-19 11:12:47 -07:00
Raymond Hettinger
1cc986e4a7
Issue 11875: Keep OrderedDict's __reduce__ from temporarily mutating the object.
2011-04-19 11:10:43 -07:00
Raymond Hettinger
35b873a7b2
merge
2011-04-19 10:23:04 -07:00
Raymond Hettinger
019a97c77c
Issue 11875: Keep OrderedDict's __reduce__ from temporarily mutating the object.
2011-04-19 10:21:27 -07:00
Raymond Hettinger
ab69438046
Hmm, __ne__ was missing
2011-04-19 10:05:53 -07:00
Raymond Hettinger
d08a2c2576
Issue 11875: Keep OrderedDict's __reduce__ from temporarily mutating the object.
2011-04-19 10:05:03 -07:00
Vinay Sajip
f97255fd7c
Updated documentation on fileConfig().
2011-04-19 13:56:39 +01:00
Nadeem Vawda
cc3f029380
Merge test_startfile fix from 3.1.
2011-04-19 01:40:45 +02:00
Nadeem Vawda
58de6ee871
Fix sporadic failure in test_startfile.
...
Wait for the child process to terminate before ending the test, so that the
regrtest cleanup code doesn't get an error when it tries to delete the
temporary CWD.
2011-04-19 01:38:47 +02:00
R David Murray
530cc09796
Fix markup.
2011-04-18 15:54:58 -04:00
Victor Stinner
27026f87d8
(Merge 3.1) Issue #11768 : The signal handler of the signal module only calls
...
Py_AddPendingCall() for the first signal to fix a deadlock on reentrant or
parallel calls. PyErr_SetInterrupt() writes also into the wake up file.
2011-04-18 16:28:39 +02:00
Victor Stinner
6c9b35bfe2
Issue #11768 : The signal handler of the signal module only calls
...
Py_AddPendingCall() for the first signal to fix a deadlock on reentrant or
parallel calls. PyErr_SetInterrupt() writes also into the wake up file.
2011-04-18 16:25:56 +02:00
R David Murray
01581ee0b7
#11492 : rewrite header folding algorithm. Less code, more passing tests.
2011-04-18 10:04:34 -04:00
Ezio Melotti
74c0031066
#11865 : Merge with 3.1.
2011-04-18 10:14:13 +03:00
Ezio Melotti
340bb95ffd
#11865 : fix typo in init.rst.
2011-04-18 10:11:21 +03:00
Raymond Hettinger
c15d9e759f
Rework multiset methods to use less memory and to make fewer calls to __hash__.
2011-04-17 19:47:24 -07:00
Raymond Hettinger
2876a8c272
Rework multiset methods to use less memory and to make fewer calls to __hash__.
2011-04-17 19:46:46 -07:00
Éric Araujo
dcb22a3936
Fix resource warning found manually
2011-04-17 14:27:07 +02:00
Éric Araujo
a0b3c32c7a
Advertise nesting directives for class/method and class/data combos.
...
Also fix a typo and a misleading example (method used to describe function).
2011-04-16 23:47:53 +02:00
Ezio Melotti
2409d770d9
Fix a few more hyphens in argparse.rst
2011-04-16 23:13:50 +03:00
Antoine Pitrou
f25a8de845
Issue #11790 : Fix sporadic failures in test_multiprocessing.WithProcessesTestCondition.
2011-04-16 21:02:01 +02:00
Antoine Pitrou
ee4293400c
Fix possible "file already exists" error when running the tests in parallel.
...
This is a perfect example of LBYL going wrong: that code could be executed
by several workers in parallel, and os.mkdir() attempted on the same
path by multiple processes.
2011-04-16 18:53:59 +02:00