summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Back port from 2.7:Barry Warsaw2012-02-221-2/+5
| | | | | | | | | 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
* Backport from 2.7:Barry Warsaw2012-02-221-3/+4
| | | | | | | | | 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
* Backport from 2.7 branch.Barry Warsaw2012-02-221-2/+8
| | | | | | | 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).
* Remove reST markup from --help output. Also: O(n**2) is dict construction, ↵Georg Brandl2012-02-213-5/+5
| | | | not single insertion.
* don't need this hack anymoreBenjamin Peterson2012-02-211-6/+0
|
* Fix crash at startup with -W options.Antoine Pitrou2012-02-215-4/+39
|
* merge headsBenjamin Peterson2012-02-211-0/+6
|\
| * Backport fix from default branch for ./python -R -Wd where hash('d') would notBarry Warsaw2012-02-211-0/+6
| | | | | | | | have gotten randomized.
* | ensure no one tries to hash things before the random seed is foundBenjamin Peterson2012-02-214-4/+14
|/
* Let's sort the keys so that this test passes even with random hashes.Barry Warsaw2012-02-211-1/+1
|
* Whitespace normalizationBarry Warsaw2012-02-211-1/+1
|
* - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEEDBarry Warsaw2012-02-2127-151/+705
| | | | | | environment variable, to provide an opt-in way to protect against denial of service attacks due to hash collisions within the dict and set types. Patch by David Malcolm, based on work by Victor Stinner.
* Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py.Barry Warsaw2012-02-201-0/+1
|
* Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in SimpleXMLRPCServerCharles-François Natali2012-02-182-1/+7
| | | | upon malformed POST request.
* Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC IV ↵Antoine Pitrou2012-01-272-1/+5
| | | | attack countermeasure.
* merge closing of 2.5 branchMartin v. Löwis2011-10-310-0/+0
|\
| * 2.5 is no longer maintained2.5Martin v. Löwis2011-10-310-0/+0
| |
* | Remove mentions of previous license in profile module (#12417 followup)Éric Araujo2011-07-283-56/+0
| |
* | fix wsBenjamin Peterson2011-06-291-3/+3
| |
* | update profile license (closes #12417)Benjamin Peterson2011-06-272-48/+28
| |
* | Replay svn r88852.Barry Warsaw2011-06-042-1/+13
| |
* | Replay svn r88850.v2.6.7Barry Warsaw2011-06-047-26/+14
| |
* | Nearly null-merge 2.5.6Martin v. Löwis2011-05-281-0/+2
|\ \ | |/
| * merge 2.5.6c1 tagMartin v. Löwis2011-05-286-7/+19
| |\
| | * Added tag v2.5.6 for changeset de34c7b097e8Martin v. Löwis2011-05-281-0/+1
| | |
| | * r88840: Prepare for 2.5.6.v2.5.6Martin v. Löwis2011-05-285-6/+17
| | |
| | * r88828: Fix year.Martin v. Löwis2011-05-281-1/+1
| | |
| * | Added tag v2.5.6c1 for changeset a87c7b96672bMartin v. Löwis2011-05-281-0/+1
| |/
| * r88824: Prepare for 2.5.6c1.v2.5.6c1Martin v. Löwis2011-05-285-7/+12
| |
* | Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commitBarry Warsaw2011-05-232-2/+12
| | | | | | | | | | | | message: Merging post 2.6.7rc2 changes from Subversion.
* | Replay changeset 70248:c714e2f92f63 from fubar branch. Original commitBarry Warsaw2011-05-237-7/+26
| | | | | | | | | | | | message: Cross-port changes for 2.6.7rc2 from the Subversion branch.
* | Replay changeset 70238:03e488b5c009 from fubar branch. Original commitBarry Warsaw2011-05-2316-35/+45
| | | | | | | | | | | | | | | | message: Reconcile with the 2.6svn branch. The 2.6.7 release will be made from Subversion, but there were differences, so this brings them in sync. These changes should *not* propagate to any newer versions.
* | These files have Windows line endings in 2.6.Barry Warsaw2011-05-231-0/+6
| |
* | Closes #11786: ConfigParser.[Raw]ConfigParser optionxform().Łukasz Langa2011-04-281-5/+7
| |
* | merge 11442 NEWSMartin v. Löwis2011-04-171-0/+3
|\ \ | |/
| * Issue 11442: Add NEWS entry for e9724d7abbc2Martin v. Löwis2011-04-171-0/+3
| |
* | Merge cleanup.Guido van Rossum2011-03-290-0/+0
|\ \
| * \ Merge urllib/urllib2 security fix from 2.5 branch.guido@google.com2011-03-295-0/+61
| |\ \ | | |/
* | | Merge issue 11662 from 2.5.Guido van Rossum2011-03-295-13/+60
|\ \ \ | | |/ | |/|
| * | Adding .hgignore (copied from default branch).guido@google.com2011-03-291-0/+66
| | |
| * | Add CVE number to urllib/urllib2 news item.guido@google.com2011-03-281-1/+1
| | |
| * | Add tests for the urllib[2] vulnerability. Change to raise exceptions.guido@google.com2011-03-284-5/+45
| | |
| * | Add FTP to the allowed url schemes. Add Misc/NEWS.guido@google.com2011-03-243-4/+9
| | |
| * | Issue 22663: fix redirect vulnerability in urllib/urllib2.guido@google.com2011-03-242-2/+18
| | |
* | | Issue #11639: Configuration function documentation referred to logging.XXX ↵Vinay Sajip2011-03-291-0/+4
| |/ |/| | | | | rather than logging.config.XXX.
* | null mergeMartin v. Löwis2011-03-210-0/+0
|\ \ | |/
| * Set subversion version identification to empty strings if this is not a ↵Martin v. Löwis2011-03-211-2/+7
| | | | | | | | | | | | | | subversion checkout (but a mercurial one). Closes #11579. Closes #11421. Patch by Senthil Kumaran.
* | Whoops. The copyright should be two lines (merge from 2.5).Guido van Rossum2011-03-191-1/+2
|\ \ | |/
| * Whoops. The copyright should be two lines.Guido van Rossum2011-03-191-1/+2
| |
* | Test commit. Add 2011 to copyright line (merge from 2.5).Guido van Rossum2011-03-191-3/+1
|\ \ | |/