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
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
a36a1ee4cf
merge 3.2
2012-10-10 16:49:11 +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
Gregory P. Smith
70e0007f55
Fixes Issue #16114 : The subprocess module no longer provides a
...
misleading error message stating that args[0] did not exist when
either the cwd or executable keyword arguments specified a path that
did not exist.
2012-10-10 03:53:16 -07:00
Gregory P. Smith
a10ddb8a55
Fixes Issue #16114 : The subprocess module no longer provides a
...
misleading error message stating that args[0] did not exist when
either the cwd or executable keyword arguments specified a path that
did not exist.
2012-10-10 03:44:47 -07:00
Gregory P. Smith
5591b02a4c
Fixes Issue #16114 : The subprocess module no longer provides a
...
misleading error message stating that args[0] did not exist when
either the cwd or executable keyword arguments specified a path that
did not exist.
It now keeps track of if the child got as far as preexec and reports it if
not back to the parent via a special "noexec" error message value in
the error pipe so that the cwd can be blamed for a failed chdir
instead of the exec of the executable being blamed instead.
The executable is also always reported accurately when exec fails.
Unittests enhanced to cover these cases.
2012-10-10 03:34:47 -07:00
Chris Jerdonek
be51a08b42
Issue #16170 : Merge subprocess test unskip from 3.3.
2012-10-09 13:19:23 -07:00
Chris Jerdonek
86b0fb23e5
Issue #16170 : Remove Linux skip from test_subprocess's test_executable test.
2012-10-09 13:17:49 -07:00
Benjamin Peterson
fc2f641358
merge 3.3
2012-10-09 11:16:33 -04:00
Benjamin Peterson
455fa0a314
merge heads
2012-10-09 11:16:26 -04:00
Benjamin Peterson
29e02a2be8
merge 3.3
2012-10-09 11:16:13 -04:00
Benjamin Peterson
b29614e047
compare singletons by identity not equality ( closes #16712 )
...
Patch from Serhiy Storchaka.
2012-10-09 11:16:03 -04:00
Benjamin Peterson
a511935151
compare with equality not identity (issue #16172 )
...
Patch from Serhiy Storchaka.
2012-10-09 11:14:59 -04: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
Richard Oudkerk
934f563353
Issue #16169 : Merge
2012-10-09 13:54:02 +01:00
Richard Oudkerk
ea69bd3ce1
Issue #16169 : Fix ctypes.WinError()'s confusion between errno and winerror
2012-10-09 13:28:10 +01: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
Vinay Sajip
6978d58e18
Closes #16168 : Merged SysLogHandler update from 3.3.
2012-10-09 08:23:06 +01:00
Vinay Sajip
7903df4125
Issue #16168 : Merged SysLogHandler update from 3.2.
2012-10-09 08:22:01 +01:00
Vinay Sajip
b5ca932be2
Issue #16168 : Use specified socket type for domain sockets in SysLogHandler.
2012-10-09 08:19:25 +01:00
Vinay Sajip
8cf4eb1463
Issue #16141 : replaced old-style exception handling code in logging with the modern idiom.
2012-10-09 08:06:13 +01: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
Chris Jerdonek
82a74cb129
Issue #16115 : Merge test skip from 3.3.
2012-10-08 17:54:45 -07:00
Chris Jerdonek
2d051b8eaf
Issue #16115 : Skip a newly added subprocess.Popen() test on Linux.
2012-10-08 17:53:46 -07:00
Chris Jerdonek
68a11fc337
Issue #16115 : Merge test improvements from 3.3.
2012-10-08 16:01:00 -07:00
Chris Jerdonek
776cb199bc
Issue #16115 : Improve testing of the executable argument to subprocess.Popen().
2012-10-08 15:56:43 -07:00
Nadeem Vawda
4907b0a2e0
bz2 module: Rewrap docstrings at 72 columns, as per PEP 8.
2012-10-08 20:31:34 +02:00