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
Ezio Melotti
1dd7c30419
Merge __next__ method link fixes with 3.2.
2012-10-12 13:45:38 +03:00
Ezio Melotti
7fa822275b
Fix links to the __next__ method.
2012-10-12 13:42:08 +03:00
Ezio Melotti
9054055857
Merge doctest fixes in functional howto with 3.3.
2012-10-12 13:30:25 +03:00
Ezio Melotti
eb818193b3
Merge doctest fixes in functional howto with 3.2.
2012-10-12 13:25:54 +03:00
Ezio Melotti
35cbf16202
Make doctests pass in the functional howto.
2012-10-12 13:24:19 +03:00
Ezio Melotti
811bd98e28
Merge functional howto improvements with 3.3.
2012-10-12 13:23:52 +03:00
Ezio Melotti
dd67c1d91a
Merge functional howto improvements with 3.2.
2012-10-12 13:23:32 +03:00
Ezio Melotti
45a101db1d
Improve markup in functional.rst, and fix a couple of errors.
2012-10-12 12:42:51 +03:00
Ezio Melotti
f79774bb92
Merge link additions/fixes with 3.3.
2012-10-12 11:02:39 +03:00
Ezio Melotti
a6229e6ebd
Fix and add more links.
2012-10-12 10:59:14 +03:00
Chris Jerdonek
e312f4d304
Merge from 3.3: Add and adjust some string-related links in the docs.
2012-10-11 18:59:34 -07:00
Chris Jerdonek
c33899bd71
Add and adjust some string-related links in the docs.
2012-10-11 18:57:48 -07:00
Chris Jerdonek
23354f505e
Merge from 3.3: Fix link to str.format() in docs.
2012-10-11 18:49:52 -07:00
Chris Jerdonek
8958cd0e8d
Merge from 3.2: Fix link to str.format() in docs.
2012-10-11 18:49:02 -07:00
Chris Jerdonek
af94724e00
Fix link to str.format() in docs.
2012-10-11 18:47:54 -07:00
Chris Jerdonek
5856e1c318
Issue #16199 : Merge 2to3 typo fix from 3.3 (and resolve previous merge).
2012-10-11 16:13:45 -07:00
Chris Jerdonek
caf380ac2a
Issue #16199 : Merge 2to3 typo fix from 3.2.
2012-10-11 16:01:00 -07:00
