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
Antoine Pitrou
baf40f01e2
Merge #11403
2011-03-11 23:44:23 +01: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
f5f6288bbc
Issue #11179 : Make ccbench work under Python 3.1 and 2.7 again.
2011-03-11 20:58:31 +01:00
Ezio Melotti
3b1eb1a7aa
#11446 : merge with 3.2.
2011-03-11 20:56:58 +02:00
Éric Araujo
a3dd56b6cf
Use with statement where it improves the documentation ( closes #10461 )
2011-03-11 17:42:48 +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
Eli Bendersky
336c729563
dummy merge from 3.2
2011-03-11 16:42:13 +02:00
Eli Bendersky
b191b8a717
Issue #11426 : use 'with' statements on open files in CSV examples
2011-03-11 16:20:54 +02:00
Eli Bendersky
6860a92be0
Issue #11426 : use 'with' statements on open files in CSV examples
2011-03-11 15:47:36 +02:00
Ezio Melotti
f0eccfd010
#11435 : Merge with 3.2
2011-03-11 15:17:25 +02:00
R David Murray
5e25525da9
?
2011-03-10 18:21:45 -05:00
R David Murray
3de991f35c
Merge heads
2011-03-10 18:08:10 -05:00
R David Murray
ee30a0be35
Merge #10999 fix.
2011-03-10 17:38:50 -05:00
Ezio Melotti
98d935b459
Dummy merge with 3.2.
2011-03-10 23:51:48 +02:00
Gregory P. Smith
1aea1dabe5
Explicitly mention that people should not depend on immediate
...
finalization of objects.
2011-03-10 11:34:52 -08:00
Eric V. Smith
7eecd22411
Remove unused import.
2011-03-10 08:44:08 -05:00