Ezio Melotti
777d0c5c21
Merge PEP name fix with 3.3.
2012-10-21 07:37:25 +03:00
Ezio Melotti
8cd45bd48d
Fix PEP name.
2012-10-21 07:36:58 +03:00
Ezio Melotti
353af2902c
Merge typo fix with 3.3.
2012-10-21 07:24:40 +03:00
Ezio Melotti
1f67e80564
Fix typo.
2012-10-21 07:24:13 +03:00
Ezio Melotti
d5050b3e17
Merge indentation fixes with 3.3.
2012-10-21 03:22:53 +03:00
Ezio Melotti
b24d3cf769
Fix indentation (or Sphinx will think these are attributes of ConnectionError).
2012-10-21 03:22:05 +03:00
Ned Deily
257c1323f7
Issue #10405 : merge from 3.3
2012-10-20 13:28:16 -07:00
Ned Deily
d2cc1bb057
Issue #10405 : merge from 3.2
2012-10-20 13:27:32 -07:00
Ned Deily
2778d0d147
Issue #10405 : Document IDLE context menus in Standard Library document
...
and IDLE Help file. (Thanks to Nick ODell and Todd Rovito for suggestions.)
Update Debug menu options in docs to match current code plus various other
minor IDLE doc and help edits.
2012-10-20 13:25:34 -07:00
Ezio Melotti
13b1547e1b
Merge punctuation fixes with 3.3.
2012-10-20 22:54:12 +03:00
Ezio Melotti
76e7ea5b4c
Fix punctuation.
2012-10-20 22:53:47 +03:00
Ezio Melotti
022b6d2fa5
Merge "seealso" change with 3.3.
2012-10-20 16:27:51 +03:00
Ezio Melotti
36e01df18e
Move note about the implementation in the "seealso".
2012-10-20 16:26:18 +03:00
Nick Coghlan
aaa28832fd
Merge from 3.3
2012-10-20 20:13:42 +10:00
Nick Coghlan
40c67739ba
Fix typo in example (pointed out by a couple of people, most recently Ken Rimey)
2012-10-20 20:13:21 +10:00
Ezio Melotti
8d3069a221
Merge wrong escape removal with 3.3.
2012-10-19 20:40:57 +03:00
Ezio Melotti
5b69fbd4c9
Remove wrong escape in code snippet.
2012-10-19 20:40:18 +03:00
Chris Jerdonek
56d279fe35
Merge from 3.3: clarify universal-newline wording in tutorial (issue #16266 ).
...
This also null merges from a previous commit.
2012-10-17 20:29:07 -07:00
Chris Jerdonek
206f962f32
Merge from 3.2: clarify universal-newline wording in tutorial (issue #16266 ).
2012-10-17 20:21:05 -07:00
Chris Jerdonek
5bf7f1f6e3
Clarify universal-newline wording in tutorial (issue #16266 ).
2012-10-17 20:17:41 -07:00
Andrew Svetlov
41695b6673
Merge issue #9583 : Document startup option/environment interaction.
...
Patch by Todd Rovito.
2012-10-17 17:16:45 +03:00
Andrew Svetlov
2365f41a0e
Merge issue #9583 : Document startup option/environment interaction.
...
Patch by Todd Rovito.
2012-10-17 17:16:19 +03:00
Andrew Svetlov
abfc7df149
Issue #9583 : Document startup option/environment interaction.
...
Patch by Todd Rovito.
2012-10-17 17:15:43 +03:00
Andrew Svetlov
a3f862e915
Merge issue #16265 : Fix collapsing of code sample in tutorial.
...
Thanks to Yongzhi Pan from docs@
2012-10-17 16:46:50 +03:00
Andrew Svetlov
65b4b40e24
Merge issue #16265 : Fix collapsing of code sample in tutorial.
...
Thanks to Yongzhi Pan from docs@
2012-10-17 16:46:00 +03:00
Andrew Svetlov
e9cf97cf20
Issue #16265 : Fix collapsing of code sample in tutorial.
...
Thanks to Yongzhi Pan from docs@
2012-10-17 16:41:28 +03:00
R David Murray
4d289a2a4d
Merge: A couple more whatsnew updates.
2012-10-16 21:54:12 -04:00
R David Murray
e54c718572
A couple more whatsnew updates.
2012-10-16 21:52:24 -04:00
Ezio Melotti
6ca07a221a
Merge typo fix.
2012-10-16 21:51:06 +03:00
Ezio Melotti
ad626807a6
Fix typo.
2012-10-16 21:50:33 +03:00
Nick Coghlan
68e9d7c102
Merge concurrent.futures dict comp tweak from 3.3
2012-10-16 23:14:38 +10:00
Nick Coghlan
d6d5cf33ef
A dict comprehension is much prettier (thanks Antoine)
2012-10-16 23:14:03 +10:00
Nick Coghlan
c7c03ba5be
Merge concurrent.futures example changes from 3.3
2012-10-16 22:51:11 +10:00
Nick Coghlan
f06ea25df2
Tweak the threaded example in concurrent.futures
2012-10-16 22:50:04 +10:00
Andrew Svetlov
b3fe704a4a
Merge issue #15936 : Reformat text for os.random to follow Larry Hastings suggestion
2012-10-16 13:52:53 +03:00
Andrew Svetlov
2bfe386091
Issue #15936 : Reformat text for os.random to follow Larry Hastings suggestion
2012-10-16 13:52:25 +03:00
Andrew Svetlov
f4e5044638
Merge issue #15936 : Add link from os.urandom to random.SystemRandom
2012-10-16 13:15:35 +03:00
Andrew Svetlov
03cb99c2d1
Issue #15936 : Add link from os.urandom to random.SystemRandom
2012-10-16 13:15:06 +03:00
Chris Jerdonek
c7633e684b
Issue #16225 : Merge from 3.3: Add additional note to tutorial about looping.
2012-10-15 19:47:32 -07:00
Chris Jerdonek
38049bb251
Issue #16225 : Merge from 3.2: Add additional note to tutorial about looping.
2012-10-15 19:46:34 -07:00
Chris Jerdonek
4fab8f0e06
Issue #16225 : Add additional note to tutorial about changing sequence while looping.
2012-10-15 19:44:47 -07:00
Chris Jerdonek
fe4985a1bb
Issue #16206 : Merge dict documentation improvements from 3.3.
...
Improve the documentation of the dict constructor. This change includes
replacing the single-line signature documentation with a more complete
multiple-line signature.
2012-10-13 03:26:10 -07:00
Chris Jerdonek
39b867000b
Issue #16206 : Merge dict documentation improvements from 3.2.
...
Improve the documentation of the dict constructor. This change includes
replacing the single-line signature documentation with a more complete
multiple-line signature.
2012-10-13 03:25:18 -07:00
Chris Jerdonek
f341317185
Issue #16206 : Improve the documentation of the dict constructor.
...
This change includes replacing the single-line signature documentation
with a more complete multiple-line signature.
2012-10-13 03:22:33 -07:00
Chris Jerdonek
145fb897f2
Merge from 3.3: Undo changes accidentally reverted in de8787029fe4.
2012-10-12 20:31:50 -07:00
Chris Jerdonek
006d907afc
Undo changes accidentally reverted in de8787029fe4.
2012-10-12 20:28:26 -07:00
Benjamin Peterson
4604980854
merge 3.3
2012-10-12 12:05:09 -04:00
Benjamin Peterson
b548d49f65
merge heads
2012-10-12 12:05:01 -04:00
Benjamin Peterson
143d034ecd
merge 3.2
2012-10-12 12:04:32 -04:00
Ezio Melotti
5c3283e43a
Merge __next__ method link fixes with 3.3.
2012-10-12 13:46:37 +03:00