Commit graph

50984 commits

Author SHA1 Message Date
Benjamin Peterson
66d2bd7fae merge heads 2012-03-14 21:07:00 -05:00
Gregory P. Smith
7210025aa3 merge heads. 2012-03-14 18:13:25 -07:00
Gregory P. Smith
99576c04f1 Fixes Issue 14234: fix for the previous commit, keep compilation when
using --with-system-expat working when the system expat does not have
salted hash support.
2012-03-14 18:12:23 -07:00
Gregory P. Smith
c10f5c2828 Fixes Issue 14234: fix for the previous commit, keep compilation when
using --with-system-expat working when the system expat does not have
salted hash support.
2012-03-14 18:12:23 -07:00
Barry Warsaw
e236ad3113 merge 2.6 2012-03-14 17:18:46 -07:00
Barry Warsaw
e9bc2f773f - Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash
table internal to the pyexpat module's copy of the expat library to avoid a
  denial of service due to hash collisions.  Patch by David Malcolm with some
  modifications by the expat project.
2012-03-14 17:10:41 -07:00
Matthias Klose
3cef2a931c - rename configure.in to configure.ac
- change references from configure.in to configure.ac
2012-03-14 23:39:33 +01:00
Gregory P. Smith
d0e1a5b241 Fixes Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes
in the hash table internal to the pyexpat module's copy of the expat
library to avoid a denial of service due to hash collisions.
Patch by David Malcolm with some modifications by the expat project.
2012-03-14 15:28:10 -07:00
Gregory P. Smith
c8ff46032f Fixes Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes
in the hash table internal to the pyexpat module's copy of the expat
library to avoid a denial of service due to hash collisions.
Patch by David Malcolm with some modifications by the expat project.
2012-03-14 15:28:10 -07:00
Georg Brandl
f590e0458e Closes #14289: put a link to the CHM download page on the docs download page. 2012-03-14 08:18:47 +01:00
Martin v. Löwis
f163efd736 Issue #5219: Prevent event handler cascade in IDLE.
Patch by Roger Serwy.
2012-03-13 14:46:22 -07:00
Vinay Sajip
71e51d66d6 Merged upstream change. 2012-03-13 12:18:55 +00:00
Vinay Sajip
9790e083a5 Closes #14267: Corrected computation of rollover filename. 2012-03-13 12:06:35 +00:00
Senthil Kumaran
d17a898fcf Fix closes Issue14281 - Test for cgi.escape by Brian Landers 2012-03-13 01:48:41 -07:00
Senthil Kumaran
b968b36ad0 merge heads 2012-03-13 00:15:15 -07:00
Ezio Melotti
b56b6fff1f #14179: add tests for re.compile. Patch by Florian Mladitsch. 2012-03-13 01:25:40 +02:00
Senthil Kumaran
c768d4caa8 closes issue14257 - Grammatical fix 2012-03-12 10:05:04 -07:00
Senthil Kumaran
814d316888 closes issue14257 minor error in glossary wording regarding __hash__ 2012-03-11 21:04:05 -07:00
Senthil Kumaran
15b6f3f825 Fix closes issue14258 - added clarification to \W and \S flags 2012-03-11 20:37:39 -07:00
Ezio Melotti
b60156e809 #14161: fix test failures on Windows. 2012-03-12 02:09:02 +02:00
Ezio Melotti
eace3a7261 #14161: fix compile error under Windows. 2012-03-12 01:28:45 +02:00
Ezio Melotti
11f8b6872a #14161: fix the __repr__ of file objects to escape the file name. 2012-03-12 01:17:02 +02:00
Antoine Pitrou
f60845b70a Issue #14252: Fix subprocess.Popen.terminate() to not raise an error under Windows when the child process has already exited. 2012-03-11 19:29:12 +01:00
Mark Dickinson
5081957642 Closes #9574: Note that complex constructor doesn't allow whitespace around central operator. 2012-03-10 16:09:35 +00:00
Jason R. Coombs
e107ab3b6c Moved symlink support into its own module. Ported can_symlink from Python 3.2, skipping symlink test when it cannot be invoked (such as when the symlink privilege is not present). 2012-03-08 18:28:08 -05:00
Jason R. Coombs
ea4629afa6 Improve the test case to avoid spurious errors about already existing symlinks. 2012-03-08 10:31:29 -05:00
Jason R. Coombs
0e17dfbdcf Test in 6c218b9c5c4c was inadvertently converted from #ifdef to #if. Now #ifdef again. 2012-03-08 09:56:00 -05:00
Ezio Melotti
452bfcc222 #14114: don't include copybutton.js in the htmlhelp output. 2012-02-25 19:24:24 +02:00
Ezio Melotti
0e49449118 #14114: don't include copybutton.js in the htmlhelp output. 2012-02-25 19:24:24 +02:00
Georg Brandl
11d748e422 Fix link to global module index. 2012-03-03 21:25:42 +01:00
Éric Araujo
021eddfff6 Fix long-standing bugs with MANIFEST.in parsing on Windows (#6884).
These regex changes fix a number of issues for distutils on Windows:
- #6884: impossible to include a file starting with 'build'
- #9691 and #14004: sdist includes too many files
- #13193: test_filelist failures

This commit replaces the incorrect changes done in 557a973709de,
c566a3447ba1 and 3925081a7ca0 to fix #13193; we were too eager to fix
the test failures and I did not study the code enough before
greenlighting patches.  This time we have unit tests from the problems
reported by users to be sure we have the right fix.

Thanks to Nadeem Vawda for his help.
2012-02-25 16:13:53 +01:00
Martin v. Löwis
3a34c5100d Add 2.7.3 and 2.7.4 UUIDs 2012-02-25 10:37:41 +01:00
Benjamin Peterson
94e5c933ed update pydoc-topics 2012-02-23 15:18:13 -05:00
Barry Warsaw
6707826c66 Added tag v2.6.8rc1 for changeset 5356b6c7fd66 2012-02-23 11:10:31 -05:00
Barry Warsaw
2593eac34e Added tag v2.6.8rc1 for changeset caab08cd2b3e 2012-02-23 10:59:50 -05:00
Barry Warsaw
74f4bd53e0 Bump some more copyright years (as per PEP 101), since this is the first
release of 2.6 for 2012.
2012-02-23 10:59:38 -05:00
Barry Warsaw
1fbc16d050 Bump to version 2.6.8rc1. 2012-02-23 10:55:57 -05:00
Benjamin Peterson
0473486d7f Added tag v2.7.3rc1 for changeset b2c6aff96e12 2012-02-23 10:52:23 -05:00
Benjamin Peterson
a2aa2ef313 bump to 2.7.3rc1 2012-02-23 10:52:17 -05:00
Barry Warsaw
a13294e209 null merge from 2.6 2012-02-22 17:27:47 -05:00
Barry Warsaw
b383e806b6 Back port from 2.7:
http://hg.python.org/cpython/rev/48705250232c
    changeset:   75187:48705250232c
    branch:      2.7
    parent:      75184:9a1d902714ae
    user:        Antoine Pitrou <solipsis@pitrou.net>
    date:        Wed Feb 22 22:16:25 2012 +0100
2012-02-22 17:26:50 -05:00
Antoine Pitrou
341016e8bf Fix sporadic test_os failure under Windows 2012-02-22 22:16:25 +01:00
Barry Warsaw
adbcc4cf40 null merge from 2.6 2012-02-22 14:27:53 -05:00
Barry Warsaw
56fd6617b5 Backport from 2.7:
changeset:   75153:9b7c6dd19e25
    branch:      2.7
    parent:      75151:b1a02c17b327
    user:        Antoine Pitrou <solipsis@pitrou.net>
    date:        Tue Feb 21 22:02:04 2012 +0100
    files:       Lib/test/test_os.py
2012-02-22 13:50:04 -05:00
Barry Warsaw
fa5d224a20 null merge from 2.6 2012-02-22 13:39:59 -05:00
Barry Warsaw
6a9005b4eb Backport from 2.7 branch.
changeset:   75165:780008020c40
    user:        Antoine Pitrou <solipsis@pitrou.net>
    date:        Wed Feb 22 03:33:56 2012 +0100
    summary:     Fix (presumably) test_hash under big-endian systems (PPC).
2012-02-22 13:34:18 -05:00
Antoine Pitrou
4b670f541c Fix (presumably) test_hash under big-endian systems (PPC). 2012-02-22 03:33:56 +01:00
Nadeem Vawda
f00011aff4 Issue #14053: Fix "make patchcheck" to work with MQ.
Patch by Francisco Martín Brugué
2012-02-22 11:40:09 +02:00
Antoine Pitrou
93291534b7 Avoid py3k warnings related to sort() of unrelated types. 2012-02-22 00:28:46 +01:00
Georg Brandl
66e565ee48 merge with 2.6 2012-02-21 22:38:31 +01:00