R David Murray
7d9129c147
Merge long Japanese header fix from 3.2.
2011-03-14 21:14:53 -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
R David Murray
4572572718
Merge linesep docstring changes from 3.2.
2011-03-14 18:39:41 -04:00
R David Murray
750beda535
Merge #11496 from 3.2.
2011-03-14 17:14:29 -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
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
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
Eric V. Smith
4169826a00
Typos.
2011-03-14 10:56:33 -04:00
R David Murray
af9be20060
Merge #11488 patch from 3.2.
2011-03-14 09:58:59 -04:00
Ross Lagerwall
41b1228525
Merge with 3.2
2011-03-14 10:42:24 +02:00
R David Murray
74fb7601ba
Merge whitespace fix from 3.2.
2011-03-13 22:49:44 -04:00
R David Murray
dcd79a2d15
Merge fix for #11490 from 3.2.
2011-03-13 22:31:35 -04:00
R David Murray
accd1c040f
#1162477 : accept '.' in addition to ':' when parsing time in date header.
...
Some non-compliant MUAs use '.'s, so by the Postel Principle we should
accept them. Patch by Thomas Herve.
2011-03-13 20:06:23 -04:00
Antoine Pitrou
0cfc23762f
Issue #11329 : PyEval_InitThreads() cannot be called before Py_Initialize() anymore
2011-03-13 23:29:10 +01:00
Benjamin Peterson
c9723d09eb
use only the hex version, since the revno is unreliable across repos
2011-03-13 16:36:08 -05:00
Antoine Pitrou
0d23189dae
Remove documentation to non-existent function PyObject_CopyToObject ( fixes #11478 )
2011-03-13 19:32:21 +01:00
Antoine Pitrou
f74dee4b88
Merge commit for #11233
2011-03-13 19:16:03 +01:00
Raymond Hettinger
279755a165
Issue #7391 : Remove outdated HOWTO with permission of its author.
2011-03-12 22:31:06 -05:00
Benjamin Peterson
87c9e548f5
merge heads
2011-03-12 18:35:48 -06:00
Benjamin Peterson
678da9fefb
bump ast version
2011-03-12 18:35:23 -06:00
Benjamin Peterson
0d6245dd89
actually get file rev
2011-03-12 18:35:02 -06:00
Ezio Melotti
32657fb152
Merge with 3.2.
2011-03-13 02:29:11 +02:00
Benjamin Peterson
6cb2b923e0
convert ast versioning to mercurial
2011-03-12 18:28:16 -06:00
Ezio Melotti
540fcd7287
Dummy merge with 3.2.
2011-03-12 22:32:13 +02:00
Benjamin Peterson
32b0127007
merge 3.2
2011-03-12 11:59:10 -06:00
Eric V. Smith
b9cd3531c4
Issue 9856: Change object.__format__ with a non-empty format string from a PendingDeprecationWarning to a DeprecationWarning.
2011-03-12 10:08:48 -05:00
Éric Araujo
e4f6a80ed8
Fix example in atexit doc: Both open and read could raise the IOError ( #10461 follow-up).
...
Thanks to SilenGhost for catching this.
2011-03-12 15:56:09 +01:00
Mark Dickinson
e8eabe7b16
Merge #11131
2011-03-12 11:18:46 +00:00
Senthil Kumaran
dcdbfec87f
Recording the merge.
2011-03-12 11:44:09 +08:00
orsenthil@gmail.com
476021b3d0
Fix issue11283 - Clarifying a re pattern in the re module docs for conditional regex
2011-03-12 10:46:25 +08:00
Brett Cannon
ceae11de9b
merge
2011-03-11 17:46:21 -05:00
Brett Cannon
755d5129c6
Remove a now unneeded tweak to test_zipimport_support in order to not
...
fail under tracing.
2011-03-11 17:44:43 -05:00