Commit graph

48857 commits

Author SHA1 Message Date
Éric Araujo
92952cc181 Merge 3.2 2011-04-24 02:49:10 +02:00
Éric Araujo
0c91e1d941 Branch merge 2011-04-24 02:47:37 +02:00
Éric Araujo
b547148d16 Fix indentation 2011-04-24 02:44:39 +02:00
Éric Araujo
fbeb1a9468 Merge 3.1 2011-04-24 02:42:52 +02:00
Éric Araujo
cae1be85f5 Branch merge 2011-04-24 02:39:43 +02:00
Éric Araujo
5348b63a91 Branch merge 2011-04-24 02:34:11 +02:00
Éric Araujo
2b9388a033 Fix weird executable name 2011-04-22 21:27:10 +02:00
Vinay Sajip
00bdbe1d97 Fixed bug in test_logging. 2011-04-22 00:17:46 +01:00
Ezio Melotti
707d1e6cea Merge with 3.2. 2011-04-22 01:57:47 +03:00
Ezio Melotti
5569e9b150 Fix some more markup glitches in argparse doc. 2011-04-22 01:42:10 +03:00
Ezio Melotti
7817e3b151 #11904-#11905: Merge typo fixes with 3.2. 2011-04-21 23:12:53 +03:00
Ezio Melotti
dca309d137 #11905: fix missing full stop in argparse doc. Noticed by Vladimir Rutsky. 2011-04-21 23:09:27 +03:00
Ezio Melotti
2f1db7def9 #11904: fix indentation in argparse doc. Noticed by Vladimir Rutsky. 2011-04-21 23:06:48 +03:00
Ezio Melotti
ccb054759a #11902: Merge with 3.2. 2011-04-21 22:58:40 +03:00
Ezio Melotti
00f53afdda #11902: Fix typo in argparse doc. Noticed by Vladimir Rutsky. 2011-04-21 22:56:51 +03:00
Raymond Hettinger
295c1d4f19 Add another example for accumulate(). 2011-04-21 11:09:28 -07:00
Ezio Melotti
5bba6c2785 Merge with 3.2. 2011-04-21 16:13:44 +03:00
Ezio Melotti
0ee9c1be76 Add the :mod: role where it was missing. 2011-04-21 16:12:17 +03:00
Ezio Melotti
c6f079d1b2 #11885: Merge with 3.2. 2011-04-21 15:29:04 +03:00
Ezio Melotti
cca4ef8cba #11885: capitalize Python. 2011-04-21 15:26:46 +03:00
Ezio Melotti
5149eedddf #11897: Merge with 3.2. 2011-04-21 14:49:56 +03:00
Ezio Melotti
c17c1f64aa #11897: Fix typo in porting howto. Patch by Marti Raudsepp. 2011-04-21 14:49:03 +03:00
Éric Araujo
de579d4359 Add a space to make json doc a bit more readable 2011-04-21 02:37:41 +02:00
Benjamin Peterson
2b8ef2df57 say struct sequence rather than structseq and link to glossary 2011-04-20 18:31:22 -05:00
Benjamin Peterson
82f614b20a glossary entry for struct sequence 2011-04-20 18:27:32 -05:00
Victor Stinner
a154b5cea4 Simplify _count_elements() in _collections
PyIter_Next() cannot return a PyExc_StopIteration: it clears this exception.
2011-04-20 23:23:52 +02:00
Jesus Cea
52d8fb5c54 merge 2011-04-20 22:41:39 +02:00
Jesus Cea
c2809af0fc merge heads 2011-04-20 22:41:21 +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
d9c0eb93bd null merge 2011-04-20 22:32:19 +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
4f438b7b00 Minor text rearrangement. 2011-04-20 13:09:46 -07: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
9a747fd376 merge 2011-04-20 21:13:36 +02:00
Jesus Cea
902d96b32d heads merging 2011-04-20 21:11:52 +02:00
Jesus Cea
db26dff560 heads merging 2011-04-20 21:10:20 +02:00
Jesus Cea
f386764812 null merge 2011-04-20 21:01:45 +02:00
Jesus Cea
ec81d41242 null merge 2011-04-20 21:00:40 +02:00
Ezio Melotti
5020e000c5 Merge with 3.2. 2011-04-20 21:59:06 +03:00
Ezio Melotti
af92842bf9 Use non-deprecated method name. 2011-04-20 21:56:21 +03:00
Jesus Cea
56fd326056 null merge 2011-04-20 20:54:05 +02: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
1a7206bdd3 null merge 2011-04-20 20:49:06 +02:00
Ezio Melotti
32f4db3175 Merge with 3.2. 2011-04-20 21:33:29 +03:00
Jesus Cea
7124f5f7e8 MERGE: Up-port changeset 5cf8f6da8743 (closes #11890) 2011-04-20 20:32:52 +02:00