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
Benjamin Peterson
78ef0885b4
merge 3.2
2012-10-12 12:02:06 -04:00
Benjamin Peterson
7a9953edfb
skip if __doc__ is gone
2012-10-12 11:44:19 -04:00
Benjamin Peterson
a5c4090394
skip if __doc__ is gone
2012-10-12 11:44:19 -04:00
Benjamin Peterson
951a9e381b
fix to work if __doc__ is removed
2012-10-12 11:44:10 -04:00
Benjamin Peterson
fa5f75a7ce
fix to work if __doc__ is removed
2012-10-12 11:44:10 -04:00
Benjamin Peterson
fe1bcb64cd
move more variable declarations to the top of blocks
2012-10-12 11:40:01 -04:00
Benjamin Peterson
f208df3618
move declaration to top of block
2012-10-12 11:37:56 -04:00
Benjamin Peterson
31a58ff1c3
ceval cleanup
...
- Make many variables local to the opcode; Kill u, v, w, and x.
- Force every opcode to end with DISPATCH or jump to error handling.
- Simplify error handling.
- Check error statuses in more places.
Closes #16191 .
2012-10-12 11:34:51 -04:00
Brett Cannon
6072e0bf42
Remove uses of % with str.format.
2012-10-12 10:00:34 -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
Brian Curtin
e33f20c4e9
Merge 3.2
2012-10-11 16:12:47 -05:00
Brian Curtin
859947da97
Merge 3.2
2012-10-11 16:11:37 -05:00
Brian Curtin
0b960f5a58
Fix #16176 . Properly identify Windows 8 via platform.platform()
...
Add handling of the 6.2 release line, aka Windows 8 and Windows 2012 Server.
2012-10-11 16:07:52 -05:00
Vinay Sajip
bd40d3e144
Closes #15776 : pyvenv now works with existing directories.
2012-10-11 17:22:45 +01:00
Senthil Kumaran
24dfdb69ca
code smell. remove pdb
2012-10-11 00:11:26 -07: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
Jesus Cea
5ea197aef3
Closes #16135 : Removal of OS/2 support (distutils) (II)
2012-10-11 01:56:01 +02:00
Jesus Cea
d17833d360
Closes #16135 : Removal of OS/2 support (distutils)
2012-10-11 01:20:12 +02:00
Brett Cannon
9407d50208
Merge fix for issue #15111 .
2012-10-10 19:18:37 -04:00
Brett Cannon
a6ce4fd426
Closes issue #15111 : Calling __import__ with a module specified in
...
fromlist which causes its own ImportError (e.g. the module tries to
import a non-existent module) should have that exception propagate.
2012-10-10 19:03:46 -04:00
Benjamin Peterson
b36a05094d
merge heads
2012-10-10 14:10:44 -04:00
Benjamin Peterson
00f86f2202
add some missing DISPATCH()
2012-10-10 14:10:33 -04:00
Chris Jerdonek
db8570349e
Issue #12947 : Merge doctest documentation change from 3.3.
2012-10-10 08:36:43 -07:00