Commit Graph

43794 Commits

Author SHA1 Message Date
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
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
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 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
Georg Brandl 3aec568e6e Remove reST markup from --help output. Also: O(n**2) is dict construction, not single insertion. 2012-02-21 22:36:27 +01:00
Benjamin Peterson 4e171d12da don't need this hack anymore 2012-02-21 15:08:51 -05:00
Antoine Pitrou 776af4002b Fix crash at startup with -W options. 2012-02-21 20:42:48 +01:00
Benjamin Peterson 876e789f65 merge heads 2012-02-21 11:23:21 -05:00
Barry Warsaw 8757cad394 Backport fix from default branch for ./python -R -Wd where hash('d') would not
have gotten randomized.
2012-02-21 11:16:06 -05:00
Benjamin Peterson 26da920001 ensure no one tries to hash things before the random seed is found 2012-02-21 11:08:50 -05:00
Barry Warsaw b69fa1f8b7 Let's sort the keys so that this test passes even with random hashes. 2012-02-21 10:22:34 -05:00
Barry Warsaw b19fb2462e Whitespace normalization 2012-02-20 20:44:15 -05:00
Barry Warsaw 1e13eb084f - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED
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.
2012-02-20 20:42:21 -05:00
Barry Warsaw f5a5beb339 Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py. 2012-02-20 14:43:22 -05:00
Charles-François Natali 66f3cc6f8d Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in SimpleXMLRPCServer
upon malformed POST request.
2012-02-18 14:15:38 +01:00
Antoine Pitrou d358e0554b Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC IV attack countermeasure. 2012-01-27 09:42:45 +01:00
Martin v. Löwis 141e770e8f merge closing of 2.5 branch 2011-10-31 12:39:25 +01:00
Martin v. Löwis e5b9bff214 2.5 is no longer maintained 2011-10-31 12:38:50 +01:00
Éric Araujo 345fff3de8 Remove mentions of previous license in profile module (#12417 followup) 2011-07-28 22:27:28 +02:00
Benjamin Peterson 5ac56d275d fix ws 2011-06-28 21:57:21 -05:00
Benjamin Peterson 1105f34a2b update profile license (closes #12417) 2011-06-27 09:14:34 -05:00
Barry Warsaw d0366e862a Replay svn r88852. 2011-06-03 20:05:48 -04:00
Barry Warsaw 16ec24a192 Replay svn r88850. 2011-06-03 20:02:47 -04:00
Martin v. Löwis 9c53584ebd Nearly null-merge 2.5.6 2011-05-28 14:13:32 +02:00
Martin v. Löwis 228516c3f8 merge 2.5.6c1 tag 2011-05-28 14:06:55 +02:00
Martin v. Löwis dcdf0320c0 Added tag v2.5.6c1 for changeset a87c7b96672b 2011-05-28 14:05:31 +02:00
Martin v. Löwis 4ca9d48a04 Added tag v2.5.6 for changeset de34c7b097e8 2011-05-28 14:00:37 +02:00
Martin v. Löwis 11a859d70d r88840: Prepare for 2.5.6. 2011-05-28 13:58:36 +02:00
Martin v. Löwis e81c485e57 r88828: Fix year. 2011-05-28 13:57:28 +02:00
Martin v. Löwis cf60858b55 r88824: Prepare for 2.5.6c1. 2011-05-28 13:56:22 +02:00
Barry Warsaw 32140f8955 Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commit
message:

Merging post 2.6.7rc2 changes from Subversion.
2011-05-23 15:27:52 -04:00
Barry Warsaw 34289260da Replay changeset 70248:c714e2f92f63 from fubar branch. Original commit
message:

Cross-port changes for 2.6.7rc2 from the Subversion branch.
2011-05-23 15:26:11 -04:00
Barry Warsaw cf0d8ab818 Replay changeset 70238:03e488b5c009 from fubar branch. Original commit
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.
2011-05-23 15:22:56 -04:00
Barry Warsaw e26bc109ff These files have Windows line endings in 2.6. 2011-05-22 21:16:55 -04:00
Łukasz Langa 22108f1bb0 Closes #11786: ConfigParser.[Raw]ConfigParser optionxform(). 2011-04-28 17:27:59 +02:00
Martin v. Löwis 31e1b1f69c merge 11442 NEWS 2011-04-17 22:56:19 +02:00
Martin v. Löwis 2d253dd9ea Issue 11442: Add NEWS entry for e9724d7abbc2 2011-04-17 22:29:40 +02:00
Guido van Rossum 8c850bf819 Merge cleanup. 2011-03-29 13:03:10 -07:00
Guido van Rossum 079381d236 Merge issue 11662 from 2.5. 2011-03-29 12:51:16 -07:00
guido@google.com 9a9fdfad59 Merge urllib/urllib2 security fix from 2.5 branch. 2011-03-29 10:48:23 -07:00
guido@google.com 92ecb8737b Adding .hgignore (copied from default branch). 2011-03-29 09:53:33 -07:00
Vinay Sajip af1fee06c9 Issue #11639: Configuration function documentation referred to logging.XXX rather than logging.config.XXX. 2011-03-29 01:07:50 +01:00
guido@google.com db3080e68f Add CVE number to urllib/urllib2 news item. 2011-03-28 13:53:40 -07:00
guido@google.com f1509306d2 Add tests for the urllib[2] vulnerability. Change to raise exceptions. 2011-03-28 13:47:01 -07:00
guido@google.com 2bc23b8448 Add FTP to the allowed url schemes. Add Misc/NEWS. 2011-03-24 10:44:17 -07:00
guido@google.com 60a4a90c8d Issue 22663: fix redirect vulnerability in urllib/urllib2. 2011-03-24 08:07:45 -07:00
Martin v. Löwis f23c515e5b null merge 2011-03-21 10:31:44 +01:00