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
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
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
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
f74dee4b88
Merge commit for #11233
2011-03-13 19:16:03 +01: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
Mark Dickinson
e8eabe7b16
Merge #11131
2011-03-12 11:18:46 +00: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
Antoine Pitrou
16c4ce1903
Issue #9935 : Speed up pickling of instances of user-defined classes.
2011-03-11 21:30:43 +01:00
Antoine Pitrou
17b880a5d6
Issue #11244 : The peephole optimizer is now able to constant-fold
...
arbitrarily complex expressions. This also fixes a 3.2 regression where
operations involving negative numbers were not constant-folded.
2011-03-11 17:27:02 +01:00
Eric V. Smith
7eecd22411
Remove unused import.
2011-03-10 08:44:08 -05:00
Ned Deily
33cb5c9017
Issue #5622 : merge fix from 3.2.
2011-03-09 02:49:59 -08:00
Vinay Sajip
df309939e5
Issue #11444 : Merge fix from 3.2.
2011-03-08 22:54:11 +00:00
Giampaolo Rodolà
7a2114719d
#8594 : fix ResourceWarning in test_ftplib.py - patch by Nadeem Vawda.
2011-03-08 21:33:21 +01:00
Benjamin Peterson
a393bb7718
merge 3.2
2011-03-07 22:52:31 -06:00
Vinay Sajip
4bcfb92168
Issue #11424 : Merged fix from 3.2.
2011-03-07 18:14:36 +00:00
Vinay Sajip
44b740ff28
#Issue 11424: merged fix from 2.6.
2011-03-07 15:07:58 +00:00
Vinay Sajip
8dd2a40bc7
Issue #11424 : Fix bug in determining child loggers.
2011-03-07 15:02:11 +00:00
Benjamin Peterson
2ae5cffb3a
merge 3.1
2011-03-06 18:04:10 -06:00
Benjamin Peterson
c9c8d0edd6
merge 3.1
2011-03-06 17:15:06 -06:00
Benjamin Peterson
d86e4c8673
only do this sys.stderr replacing on CPython
2011-03-06 17:14:30 -06:00
Benjamin Peterson
bf12cdc24a
only do this sys.stderr replacing on CPython
2011-03-06 17:08:40 -06:00
Georg Brandl
776e586114
Remove sys.subversion and svn build identification leftovers.
2011-03-06 10:35:42 +01:00
Georg Brandl
fe09a54280
Merge build identification to default branch.
2011-03-06 10:26:32 +01:00
Georg Brandl
13039c87f1
Merge build identification to 3.2 branch.
2011-03-06 10:13:00 +01:00
Antoine Pitrou
d6f3a3e3a8
Issue #11391 : Writing to a mmap object created with
...
`mmap.PROT_READ|mmap.PROT_EXEC` would segfault instead of raising a
TypeError. Patch by Charles-François Natali.
2011-03-06 02:03:34 +01:00
Antoine Pitrou
f874debbf3
Merge fix for issue #11391
2011-03-06 01:53:19 +01:00
Antoine Pitrou
80d3610bc3
Merge fix for issue #11391
2011-03-06 01:50:56 +01:00
Antoine Pitrou
7b50c2c6ae
Fix buildbot failure following 97a5590b9291
2011-03-06 01:47:18 +01:00
Antoine Pitrou
16a0a0b0a0
Issue #11391 : Writing to a mmap object created with
...
`mmap.PROT_READ|mmap.PROT_EXEC` would segfault instead of raising a
TypeError. Patch by Charles-François Natali.
2011-03-06 01:11:03 +01:00
Antoine Pitrou
d1b1991fd4
Lib/email/test/data/msg_26.txt had its line endings wrong in the SVN repository.
...
(they were probably converted right in working copies through an SVN property)
2011-03-05 21:49:50 +01:00
