353af2902c
Merge typo fix with 3.3.
2012-10-21 07:24:40 +03:00
1f67e80564
Fix typo.
2012-10-21 07:24:13 +03:00
d5050b3e17
Merge indentation fixes with 3.3.
2012-10-21 03:22:53 +03:00
b24d3cf769
Fix indentation (or Sphinx will think these are attributes of ConnectionError).
2012-10-21 03:22:05 +03:00
257c1323f7
Issue #10405 : merge from 3.3
2012-10-20 13:28:16 -07:00
d2cc1bb057
Issue #10405 : merge from 3.2
2012-10-20 13:27:32 -07:00
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
aaa28832fd
Merge from 3.3
2012-10-20 20:13:42 +10:00
40c67739ba
Fix typo in example (pointed out by a couple of people, most recently Ken Rimey)
2012-10-20 20:13:21 +10:00
68e9d7c102
Merge concurrent.futures dict comp tweak from 3.3
2012-10-16 23:14:38 +10:00
d6d5cf33ef
A dict comprehension is much prettier (thanks Antoine)
2012-10-16 23:14:03 +10:00
c7c03ba5be
Merge concurrent.futures example changes from 3.3
2012-10-16 22:51:11 +10:00
f06ea25df2
Tweak the threaded example in concurrent.futures
2012-10-16 22:50:04 +10:00
b3fe704a4a
Merge issue #15936 : Reformat text for os.random to follow Larry Hastings suggestion
2012-10-16 13:52:53 +03:00
2bfe386091
Issue #15936 : Reformat text for os.random to follow Larry Hastings suggestion
2012-10-16 13:52:25 +03:00
f4e5044638
Merge issue #15936 : Add link from os.urandom to random.SystemRandom
2012-10-16 13:15:35 +03:00
03cb99c2d1
Issue #15936 : Add link from os.urandom to random.SystemRandom
2012-10-16 13:15:06 +03:00
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
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
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
145fb897f2
Merge from 3.3: Undo changes accidentally reverted in de8787029fe4.
2012-10-12 20:31:50 -07:00
006d907afc
Undo changes accidentally reverted in de8787029fe4.
2012-10-12 20:28:26 -07:00
4604980854
merge 3.3
2012-10-12 12:05:09 -04:00
b548d49f65
merge heads
2012-10-12 12:05:01 -04:00
143d034ecd
merge 3.2
2012-10-12 12:04:32 -04:00
5c3283e43a
Merge __next__ method link fixes with 3.3.
2012-10-12 13:46:37 +03:00
1dd7c30419
Merge __next__ method link fixes with 3.2.
2012-10-12 13:45:38 +03:00
7fa822275b
Fix links to the __next__ method.
2012-10-12 13:42:08 +03:00
f79774bb92
Merge link additions/fixes with 3.3.
2012-10-12 11:02:39 +03:00
a6229e6ebd
Fix and add more links.
2012-10-12 10:59:14 +03:00
e312f4d304
Merge from 3.3: Add and adjust some string-related links in the docs.
2012-10-11 18:59:34 -07:00
c33899bd71
Add and adjust some string-related links in the docs.
2012-10-11 18:57:48 -07:00
5856e1c318
Issue #16199 : Merge 2to3 typo fix from 3.3 (and resolve previous merge).
2012-10-11 16:13:45 -07:00
caf380ac2a
Issue #16199 : Merge 2to3 typo fix from 3.2.
2012-10-11 16:01:00 -07:00
463974916d
Issue #16199 : Fix typo in 2to3 docs. Thanks to Mark Lawrence for the report.
2012-10-11 15:59:32 -07:00
bd40d3e144
Closes #15776 : pyvenv now works with existing directories.
2012-10-11 17:22:45 +01:00
81523a6b09
Automated merge with ssh://hg.python.org/cpython
2012-10-10 23:16:29 -07:00
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
c8b8b7f661
Merge from 3.3: Fix placement of shell=True warning in subprocess.Popen() docs.
2012-10-10 22:54:55 -07:00
c3de6d63cd
Merge from 3.2: Fix placement of shell=True warning in subprocess.Popen() docs.
2012-10-10 22:53:35 -07:00
cc32a68216
Fix placement of shell=True warning in subprocess.Popen() docs.
2012-10-10 22:52:22 -07:00
ec7c16d2b4
Issue #16115 : Merge subprocess.Popen() documentation improvements from 3.3.
2012-10-10 17:49:00 -07:00
02860526eb
Issue #16115 : Merge subprocess.Popen() documentation improvements from 3.2.
2012-10-10 17:47:55 -07:00
4a4a02bbc8
Issue #16115 : Make further improvements to subprocess.Popen() documentation.
2012-10-10 17:46:18 -07:00
db8570349e
Issue #12947 : Merge doctest documentation change from 3.3.
2012-10-10 08:36:43 -07:00
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
ecb02d62e0
merge 3.3
2012-10-10 16:56:22 +02:00
23a87de96f
Missed one instance of code-block:: text highlighting to revert.
2012-10-10 16:56:15 +02:00
42ac3c91e7
merge 3.3
2012-10-10 16:49:18 +02:00
a1ff83e556
merge 3.2 heads
2012-10-10 16:49:02 +02:00
Ezio Melotti
Ned Deily
Nick Coghlan
Andrew Svetlov
Chris Jerdonek
Benjamin Peterson
Vinay Sajip
Senthil Kumaran
Georg Brandl