Gregory P. Smith
58e317ba92
merge 1579808ef25b
2011-03-15 02:15:13 -04:00
Gregory P. Smith
de3909da6b
merge 141bbcb19c06
2011-03-15 02:13:09 -04:00
Gregory P. Smith
81ce68597c
Fix the @test_NNNN_tmp file terds being left in whatever your $PWD was
...
when test_subprocess was run.
2011-03-15 02:04:11 -04:00
Ezio Melotti
373089239b
#11515 : Merge with 3.2.
2011-03-15 06:03:08 +02:00
Ezio Melotti
4969f709cc
#11515 : Merge with 3.1.
2011-03-15 05:59:46 +02:00
Ezio Melotti
42da663e6f
#11515 : fix several typos. Patch by Piotr Kasprzyk.
2011-03-15 05:18:48 +02:00
R David Murray
deaa678952
Merge redundant __contains__ doc fix from 3.2.
2011-03-14 22:54:19 -04:00
R David Murray
c48c19afe0
Merge redundant __contains__ doc fix from 3.1.
2011-03-14 22:53:29 -04:00
R David Murray
f6db0bbbee
Remove redundant __contains__ entry from Message docs.
2011-03-14 22:43:38 -04:00
R David Murray
7d9129c147
Merge long Japanese header fix from 3.2.
2011-03-14 21:14:53 -04:00
R David Murray
3a6152f3b3
Fix header encoding of long headers when using euc-jp and shift_jis.
...
When a header was long enough to need to be split across lines, the
input charset name was used instead of the output charset name in
the encoded words. This make a difference only for the two charsets
above.
2011-03-14 21:13:03 -04:00
Reid Kleckner
a9b3a1c49d
Merge with hg.python.org.
2011-03-14 19:34:13 -04:00
Reid Kleckner
93479ccbf0
Tweak subprocess test timeouts to satisfy the buildbot.
2011-03-14 19:32:41 -04:00
Michael Foord
ee354eabc9
merge default
2011-03-14 19:03:30 -04:00
Michael Foord
1341bb0019
Closes issue 11407. TestCase.run returns the result object used or created
2011-03-14 19:01:46 -04:00
Nick Coghlan
5596a8c179
Merge with remote
2011-03-15 08:59:20 +10:00
Nick Coghlan
d25fd4d710
Close #11505 : Improve string.py coverage
2011-03-15 08:54:37 +10:00
Ronald Oussoren
ba3a978fc1
Issue #11500 : Fixed a bug in the os x proxy bypass code for fully qualified IP addresses in the proxy exception list.
2011-03-14 18:48:31 -04:00
Ronald Oussoren
f2db4de4d8
Issue #11500 : Fixed a bug in the os x proxy bypass code for fully qualified IP addresses in the proxy exception list.
2011-03-14 18:46:50 -04:00
R David Murray
4572572718
Merge linesep docstring changes from 3.2.
2011-03-14 18:39:41 -04:00
R David Murray
cd37dfcfac
Harmonize linesep docstrings, and fix the quoting of \r\n
2011-03-14 18:35:56 -04:00
Ronald Oussoren
e72e161851
Issue #11500 : Fixed a bug in the os x proxy bypass code for fully qualified IP addresses in the proxy exception list
...
Patch by Scott Wilson.
2011-03-14 18:15:25 -04:00
R David Murray
750beda535
Merge #11496 from 3.2.
2011-03-14 17:14:29 -04:00
R David Murray
f8b9dfd9a1
#11496 : skip history test if clear_history is not available.
...
Patch by Natalia B. Bidart.
2011-03-14 17:10:22 -04:00
briancurtin
30bb6e0360
Fix #11491 . When dbm.open was called with a file which already exists and
...
the "flag" argument is "n", dbm.error was being raised. As documented,
dbm.open(...,flag='n') will now "Always create a new, empty database,
open for reading and writing", regardless of a previous file existing.
2011-03-14 16:36:31 -04:00
briancurtin
525c25d42f
Fix #11491 . When dbm.open was called with a file which already exists and
...
the "flag" argument is "n", dbm.error was being raised. As documented,
dbm.open(...,flag='n') will now "Always create a new, empty database,
open for reading and writing", regardless of a previous file existing.
2011-03-14 16:03:54 -04:00
briancurtin
94eceeb89c
Fix #11491 . When dbm.open was called with a file which already exists and
...
the "flag" argument is "n", dbm.error was being raised. As documented,
dbm.open(...,flag='n') will now "Always create a new, empty database,
open for reading and writing", regardless of a previous file existing.
2011-03-14 15:35:35 -04:00
Gregory P. Smith
b4039aaf35
whitespace fix
2011-03-14 14:16:20 -04:00
Gregory P. Smith
5865facfb6
merge default
2011-03-14 14:14:42 -04:00
Gregory P. Smith
54d412edcc
Add a SubprocessError base class for exceptions in the subprocess module.
2011-03-14 14:08:43 -04:00
Reid Kleckner
80b92d106e
Attempt a larger timeout value to satisfy the buildbots.
2011-03-14 13:34:12 -04:00
Ezio Melotti
1c711f0ef9
Dummy merge with 3.2.
2011-03-14 18:58:41 +02:00
Ezio Melotti
d9a7c4b8e5
Skip test that requires zlib when zlib is not available.
2011-03-14 18:57:02 +02:00
Reid Kleckner
136f572501
Merged with default.
2011-03-14 12:37:25 -04:00
Jesus Cea
736e7fc0f6
Issue #11495 : OSF support is eliminated. It was deprecated in Python 3.2
2011-03-14 17:36:54 +01:00
Reid Kleckner
28f130320b
Change versionchanged for timeout to 3.3, not 3.2.
2011-03-14 12:36:53 -04:00
Reid Kleckner
3eb2347c8c
Merge with default.
2011-03-14 12:15:42 -04:00
Ronald Oussoren
a05a503342
merge
2011-03-14 12:12:23 -04:00
Reid Kleckner
8485701714
Merge with default.
2011-03-14 12:12:18 -04:00
Reid Kleckner
31aa7dd141
Add a 'timeout' argument to subprocess.Popen.
...
If the timeout expires before the subprocess exits, the wait method and the
communicate method will raise a subprocess.TimeoutExpired exception. When used
with communicate, it is possible to catch the exception, kill the process, and
retry the communicate and receive any output written to stdout or stderr.
2011-03-14 12:02:10 -04:00
Eric V. Smith
91f0359ee4
Skip test if zlib not present. Closes #11498 . Patch by Natalia B. Bidart.
2011-03-14 11:57:16 -04:00
Ronald Oussoren
a9d397bb05
Issue #1099 : Fix the build on MacOSX when building a framework with pydebug
...
using GCC 4.0.
2011-03-14 11:34:21 -04:00
Ronald Oussoren
42d0f68458
Issue #1099 : Fix the build on MacOSX when building a framework with pydebug using GCC 4.0.
2011-03-14 11:04:34 -04:00
Eric V. Smith
4169826a00
Typos.
2011-03-14 10:56:33 -04:00
Ronald Oussoren
250324952e
Fixes #1099 : Mac compile fails with pydebug and framework enabled
...
Without this patch "./configure --with-pydebug --enable-framework CC=gcc-4.0" fails on MacOSX
2011-03-14 10:11:59 -04:00
R David Murray
af9be20060
Merge #11488 patch from 3.2.
2011-03-14 09:58:59 -04:00
R David Murray
1a5201f80d
Merge #11488 patch from 3.1.
2011-03-14 09:57:03 -04:00
R David Murray
d89ee79d19
#11488 : Add tests for writelines method of SpooledTemporaryFile.
...
Patch by Evan Dandrea.
2011-03-14 09:55:46 -04:00
Ross Lagerwall
41b1228525
Merge with 3.2
2011-03-14 10:42:24 +02:00
Ross Lagerwall
13312638b3
Merge from 3.1
2011-03-14 10:41:58 +02:00
