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
Andrew Svetlov
c9061a5a2f
Merge issue #16174 : Fix suggested usage of dummy_threading module.
...
Patch by Berker Peksag.
2012-10-09 13:45:10 +03:00
Andrew Svetlov
38714d64d0
Merge issue #16174 : Fix suggested usage of dummy_threading module.
...
Patch by Berker Peksag.
2012-10-09 13:44:48 +03:00
Andrew Svetlov
a256841b4b
Issue #16174 : Fix suggested usage of dummy_threading module.
...
Patch by Berker Peksag.
2012-10-09 13:44:16 +03:00
Vinay Sajip
cf9e2f2420
Closes #16110 : fileConfig now accepts a pre-initialised ConfigParser instance.
2012-10-09 09:06:03 +01:00
Senthil Kumaran
96df7da0ac
Fix Issue 15922: make howto/urllib2.rst doctests pass.
...
Patch by Chris Jerdonek. Address Ezio's review comment.
2012-10-09 00:40:55 -07:00
Senthil Kumaran
570bc4c465
Fix Issue 15922: make howto/urllib2.rst doctests pass.
...
Patch by Chris Jerdonek. Address Ezio's review comment.
2012-10-09 00:38:17 -07:00
Senthil Kumaran
1ed9847a5a
Fix Issue 15922: make howto/urllib2.rst doctests pass.
...
Patch by Chris Jerdonek. Address Ezio's review comment.
2012-10-09 00:37:09 -07:00
Chris Jerdonek
85aa0118db
Issue #16115 : Merge subprocess.Popen() documentation improvements from 3.3.
2012-10-08 23:14:46 -07:00
Chris Jerdonek
ad01498fa9
Issue #16115 : Merge subprocess.Popen() documentation improvements from 3.2.
2012-10-08 23:12:21 -07:00
Chris Jerdonek
470ee39883
Issue #16115 : Improve subprocess.Popen() documentation around args, shell, and executable arguments.
2012-10-08 23:06:57 -07:00
Hynek Schlawack
c3c6fe5b1a
Merge 3.3
2012-10-08 07:46:11 +02:00