Commit Graph

50541 Commits

Author SHA1 Message Date
Barry Warsaw 62cc44db0c null merge from 2.6 2012-02-23 11:03: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
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
Antoine Pitrou 0607f731f2 Fix flaky os.urandom test. 2012-02-21 22:02:04 +01:00
Benjamin Peterson 6647113419 merge 2.6 2012-02-21 15:09:08 -05:00
Benjamin Peterson 4e171d12da don't need this hack anymore 2012-02-21 15:08:51 -05:00
Antoine Pitrou 5d6eab9088 Null merge 2012-02-21 20:52:54 +01:00
Antoine Pitrou 776af4002b Fix crash at startup with -W options. 2012-02-21 20:42:48 +01:00
Antoine Pitrou cc3fa88a9c Fix crash at startup with -W options. 2012-02-21 20:42:48 +01:00
Martin v. Löwis a1b2af8034 Issue #6807: Run msisupport.mak earlier. 2012-02-21 18:12:02 +01:00
Benjamin Peterson 9d7601fcea merge 2.6 2012-02-21 11:24:21 -05:00
Benjamin Peterson 876e789f65 merge heads 2012-02-21 11:23:21 -05:00
Barry Warsaw dbe0329d4c merge 2.7 2012-02-21 11:19:00 -05:00
Barry Warsaw f7254bd2aa merge 2.6 2012-02-21 11:16:52 -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
Martin v. Löwis ef281bdddb Issue #10580: Minor grammar change in Windows installer. 2012-02-21 17:07:32 +01:00
Barry Warsaw f364b15985 null merge from 2.6 2012-02-21 10:23:27 -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
Benjamin Peterson e39ccef64c carefully don't depend on any dict order 2012-02-21 09:07:40 -05:00
Benjamin Peterson b6596c516b remove extra zero 2012-02-21 08:08:29 -05:00
Petri Lehtinen 4ab701b2d3 sqlite3: Fix 64-bit integer handling in user functions on 32-bit architectures
Closes #8033.
2012-02-21 14:04:46 +02:00
Ezio Melotti 36b7361fe7 HTMLParser is now able to handle slashes in the start tag. 2012-02-21 09:22:16 +02:00
Benjamin Peterson 9be6c3ddf0 kill interned strings computed before random initialization 2012-02-21 00:40:14 -05:00
Benjamin Peterson c7bbd7be94 don't rely on dict order 2012-02-21 00:15:10 -05:00
Benjamin Peterson c59df7d4e9 a frozenset is better here 2012-02-20 23:13:20 -05:00
Benjamin Peterson 740593416a use set 2012-02-20 23:11:19 -05:00
Benjamin Peterson f093724845 don't rely on dict order 2012-02-20 23:06:22 -05:00
Benjamin Peterson 72949bd511 this was supposed to die 2012-02-20 22:33:33 -05:00
Benjamin Peterson 5037677170 fix for real this time... 2012-02-20 22:00:46 -05:00
Benjamin Peterson 6949299e64 belately resolve conflicts here 2012-02-20 21:57:25 -05:00
Benjamin Peterson 11fa11bc95 fix test_gdb under hash randomization 2012-02-20 21:55:32 -05:00
Benjamin Peterson 5bc92e0824 don't rely on dict order here 2012-02-20 21:47:54 -05:00
Benjamin Peterson aee9dfba4a merge 2.6 with hash randomization fix 2012-02-20 21:44:56 -05:00
Barry Warsaw b19fb2462e Whitespace normalization 2012-02-20 20:44:15 -05:00