Commit Graph

14102 Commits

Author SHA1 Message Date
Chris Jerdonek c131b0760d Fix formatting of syntax description of function definition. 2012-10-25 17:21:22 -07:00
Ezio Melotti 93653c48e6 #16210: merge with 3.3. 2012-10-24 23:07:16 +03:00
Ezio Melotti e6c0f0d94a #16210: merge with 3.2. 2012-10-24 23:06:56 +03:00
Ezio Melotti 837cd06d36 #16210: combine the two type() docs. Patch by Pete Sevander. 2012-10-24 23:06:25 +03:00
Andrew Svetlov 3831bec20d Issue #16241: document -X faulthandler command line option.
Patch by Marek Šuppa.
2012-10-23 16:20:11 +03:00
Andrew Svetlov 950d5fdc7f Issue #16241: document -X faulthandler command line option.
Patch by Marek Šuppa.
2012-10-23 16:19:26 +03:00
Jesus Cea 145ce8e38b MERGE: Closes #16294: 8 space indent in tutorial 2012-10-22 13:16:05 +02:00
Jesus Cea 80c2f4fc43 MERGE: Closes #16294: 8 space indent in tutorial 2012-10-22 13:15:45 +02:00
Jesus Cea af38774b5f Closes #16294: 8 space indent in tutorial 2012-10-22 13:15:17 +02:00
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
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
Chris Jerdonek 463974916d Issue #16199: Fix typo in 2to3 docs. Thanks to Mark Lawrence for the report. 2012-10-11 15:59:32 -07:00
Vinay Sajip bd40d3e144 Closes #15776: pyvenv now works with existing directories. 2012-10-11 17:22:45 +01:00
Senthil Kumaran 81523a6b09 Automated merge with ssh://hg.python.org/cpython 2012-10-10 23:16:29 -07:00
Senthil Kumaran 52d2720499 Issue #16088: BaseHTTPRequestHandler's send_error method includes a
Content-Length header.  Patch by Antoine Pitrou.
2012-10-10 23:16:21 -07:00
Chris Jerdonek c8b8b7f661 Merge from 3.3: Fix placement of shell=True warning in subprocess.Popen() docs. 2012-10-10 22:54:55 -07:00
Chris Jerdonek c3de6d63cd Merge from 3.2: Fix placement of shell=True warning in subprocess.Popen() docs. 2012-10-10 22:53:35 -07:00
Chris Jerdonek cc32a68216 Fix placement of shell=True warning in subprocess.Popen() docs. 2012-10-10 22:52:22 -07:00
Chris Jerdonek ec7c16d2b4 Issue #16115: Merge subprocess.Popen() documentation improvements from 3.3. 2012-10-10 17:49:00 -07:00
Chris Jerdonek 02860526eb Issue #16115: Merge subprocess.Popen() documentation improvements from 3.2. 2012-10-10 17:47:55 -07:00
Chris Jerdonek 4a4a02bbc8 Issue #16115: Make further improvements to subprocess.Popen() documentation. 2012-10-10 17:46:18 -07:00
Chris Jerdonek db8570349e Issue #12947: Merge doctest documentation change from 3.3. 2012-10-10 08:36:43 -07:00
Chris Jerdonek 3fa8c59024 Issue #12947: Remove doctest directives from the doctest examples in the "Option Flag" section.
The doctest examples that illustrate the use of doctest option flags
independent of doctest directives should not display doctest directives.
2012-10-10 08:34:38 -07:00
Georg Brandl ecb02d62e0 merge 3.3 2012-10-10 16:56:22 +02:00
Georg Brandl 23a87de96f Missed one instance of code-block:: text highlighting to revert. 2012-10-10 16:56:15 +02:00
Georg Brandl 42ac3c91e7 merge 3.3 2012-10-10 16:49:18 +02:00
Georg Brandl a1ff83e556 merge 3.2 heads 2012-10-10 16:49:02 +02:00
Georg Brandl 83e51f48a8 Issue #12947: revert earlier workaround and use a monkey-patch to enable showing doctest directives only in the doctest docs. 2012-10-10 16:45:11 +02:00
Georg Brandl 3a2e101be5 Issue #12947: revert earlier workaround and use a monkey-patch to enable showing doctest directives only in the doctest docs. 2012-10-10 16:45:11 +02:00
Chris Jerdonek 6428d787aa Issue #12947: Merge doctest documentation improvements from 3.3. 2012-10-10 06:56:32 -07:00
Chris Jerdonek 3650ea2a9f Issue #12947: Divide doctest "Option Flags and Directives" section into two.
This changeset also applies the rendering workaround to the last remaining
example in the file that has a doctest directive that should be displayed.
2012-10-10 06:52:08 -07:00
Eli Bendersky 2bc53a092a Merge 3.3
Closes #16082: clarify the documentation of tostring[list] saying that it may generate a bytestring, depending on the given encoding.
2012-10-09 07:19:13 -07:00
Eli Bendersky 831893a68e Issue #16082: clarify the documentation of tostring[list] saying that it may generate a bytestring, depending on the given encoding. 2012-10-09 07:18:16 -07:00
Eli Bendersky b8d8d584f7 Merge 3.3
Issue #12322: clarify xpath reference for cases where the path reaches ancestors of the start element. Also add missing markup for a None. Thanks to patrick vrijlandt and Mike Hoy for the report and initial patches.
2012-10-09 06:47:23 -07:00
Eli Bendersky 323a43af06 Issue #12322: clarify xpath reference for cases where the path reaches ancestors of the start element. Also add missing markup for a None. Thanks to patrick vrijlandt and Mike Hoy for the report and initial patches. 2012-10-09 06:46:33 -07:00