5a9a5080cf
branch merge.
2011-03-17 14:43:21 +08:00
2e617307bc
merge from 2.6 branch
2011-03-17 14:24:35 +08:00
dfd1579e54
merge from 2.5 branch.
2011-03-17 14:23:24 +08:00
3853586e0c
Fix issue11442 - Add a charset parameter to the Content-type to avoid XSS attacks.
...
Patch by Tom N. (Backported from py3k codeline).
2011-03-17 12:34:18 +08:00
020d3d9856
<Home> toggle non-functional when NumLock set.
...
Issue3851
2011-03-17 00:05:38 -04:00
764d75f325
Changes for Wing Project file caused by mercurial transition. Plus ignoring python.exe-gdb.py.
2011-03-16 22:28:08 -04:00
4c9e91a092
Issue #10242 : backport of more fixes to unittest.TestCase.assertItemsEqual
2011-03-16 20:34:53 -04:00
2ab5994dbe
Issue #11569 : use absolute path to the sysctl command in multiprocessing to
...
ensure that it will be found regardless of the shell PATH. This ensures
that multiprocessing.cpu_count works on default installs of MacOSX.
Patch by Steffen Daode Nurpmeso.
2011-03-16 09:47:15 -04:00
b3f756404a
Revert typo fixes in zlib/*
2011-03-16 12:46:40 +02:00
c2077b0d9b
#11565 : Fix several typos. Patch by Piotr Kasprzyk.
2011-03-16 12:34:31 +02:00
6905de14fe
Close issue #8600 : test_gdb failures because innocuous warnings
2011-03-16 01:19:49 +01:00
ab40e4cb95
Merge #11216 : document all possible set_charset execution paths.
2011-03-15 18:01:04 -04:00
d4acd356b2
make this subversion artifact empty
2011-03-15 15:03:13 -05:00
8d77efc234
Revert typo fixes in _cytpes/libffi*
2011-03-15 19:09:10 +02:00
24b07bcba3
#11515 : fix several typos. Patch by Piotr Kasprzyk.
2011-03-15 18:55:01 +02:00
1aa999c49e
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:53:59 -04:00
19199830f7
Issue #1099 : Fix the build on MacOSX when building a framework with pydebug using GCC 4.0.
2011-03-14 11:57:39 -04:00
b44e1841d5
Port #11488 patch from 3.1 (changeset f816841bab03)
2011-03-14 10:01:12 -04:00
a3ed3f03d7
Issue #10885 : Fix multiprocessing docs typo
2011-03-14 10:43:36 +02:00
8c76c53019
merge heads
2011-03-13 22:40:59 -04:00
cdd5fc9013
#11490 : EACCES can also mean command not found
2011-03-13 22:37:18 -04:00
ad797b699d
#11484 : remove paragraph about with_traceback from 2.7 doc.
2011-03-13 22:55:41 +02:00
8b78a9d8ca
Remove documentation to non-existent function PyObject_CopyToObject ( fixes #11478 )
2011-03-13 19:35:04 +01:00
e10342533e
Dummy merge of 2.6 reversion of logging change
2011-03-13 21:52:31 +10:00
ec40bab21e
Issue #11426 : use 'with' statements on open files in CSV examples
2011-03-13 08:45:19 +02:00
dd6833d20a
Fix markup in inputoutput.rst.
2011-03-13 02:13:08 +02:00
4f1a665fae
clarify condition for readline to return EOF ( closes #11312 )
2011-03-12 17:12:54 -06:00
5ddf51f735
Fixes issue #11476 : StreamHandler parameter name change documented.
2011-03-12 22:43:23 +00:00
c3ab30b363
Fix typo.
2011-03-12 22:21:37 +02:00
3c5edd00a7
trunc -> math.trunc ( closes #11475 )
2011-03-12 11:58:15 -06:00
2c8c62e64d
Issue 11131: Fix sign of zero result on plus and minus operations in ROUND_FLOOR rounding mode.
2011-03-12 11:05:32 +00:00
d4f016fb51
Issue #11403 : add some MSVC-generated files to .hgignore
2011-03-11 23:46:26 +01:00
3ae81137c8
Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which should not have been made in this branch.
2011-03-11 18:44:10 +00:00
efd8bab403
#10999 : Add missing documentation for chflags constants to stat module docs
...
Patch by Michal Nowikowski.
2011-03-10 17:57:35 -05:00
3cbb66b0d9
Use simpler assert in basic example.
2011-03-10 23:35:39 +02:00
dd7c593c1f
Backport from 3.x several improvements and fixes for unittest.rst.
2011-03-10 23:00:48 +02:00
28d57c0d5c
Explicitly mention that people should not depend on finalization of
...
objects to happen immediately.
2011-03-10 11:49:27 -08:00
2ddaaff62d
Issue #11450 : Don't truncate hg version info in Py_GetBuildInfo() when
...
there are many tags (e.g. when using mq). Patch by Nadeem Vawda.
2011-03-09 12:54:00 +01:00
9d4836e731
Issue #5622 : Fix curses.wrapper to raise correct exception if curses
...
initialization fails.
2011-03-09 02:31:55 -08:00
ee145ecc5f
Issue #11444 : Merge fix from 2.6.
2011-03-08 22:47:18 +00:00
f4d0af460a
Issue #11444 : Lock handlers while flushing/closing during shutdown.
2011-03-08 22:39:55 +00:00
9e1ed47e91
#11298 : Improve the unittest discovery explanation.
2011-03-08 17:08:25 +02:00
1e93f4d1c9
Sort out 2.7 and 2.7.1 tags.
2011-03-08 11:05:40 +01:00
1af19d1ffd
transform izip_longest #11424
2011-03-07 22:50:37 -06:00
923e6d29e5
Whitespace normalization.
2011-03-07 18:20:27 +00:00
44b740ff28
#Issue 11424: merged fix from 2.6.
2011-03-07 15:07:58 +00:00
8dd2a40bc7
Issue #11424 : Fix bug in determining child loggers.
2011-03-07 15:02:11 +00:00
bf12cdc24a
only do this sys.stderr replacing on CPython
2011-03-06 17:08:40 -06:00
5edae7ea5e
Issue #11411 : Fix typo in the Makefile that prevented 'make DESTDIR=' from
...
working correctly with a relative path.
2011-03-06 11:48:05 -08:00
90f00ea624
Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that the files
...
will have the right line ending even if the extension is not active.
2011-03-06 12:27:30 +01:00
Senthil Kumaran
Kurt B. Kaiser
Michael Foord
Ronald Oussoren
Ezio Melotti
Jesus Cea
R David Murray
Benjamin Peterson
Ross Lagerwall
Antoine Pitrou
Nick Coghlan
Eli Bendersky
Vinay Sajip
Mark Dickinson
Gregory P. Smith
Ned Deily
Georg Brandl
Thomas Wouters
Martin v. Löwis