Commit Graph

50690 Commits

Author SHA1 Message Date
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
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
Benjamin Peterson 34b345b888 don't rely on the order of module clearing 2012-02-20 15:20:37 -05:00
Barry Warsaw 9769eb063c null merge from 2.6 2012-02-20 14:45:45 -05:00
Barry Warsaw b0516c2fe0 null merge from 2.6 2012-02-20 14:44:26 -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
Vinay Sajip 7d13cd3f5d logging: clarified documentation for Handler.handleError. 2012-02-20 18:34:07 +00:00
Éric Araujo bb42f5ed7f Add missing “::” markup and wrap overlong lines 2012-02-20 02:08:01 +01:00
Éric Araujo a4c81b07f8 Fix typo 2012-02-20 02:07:31 +01:00
Sandro Tosi 09c05fde63 don't split 'Hye-Shik Chang' name; thanks to Sergey from docs@ 2012-02-19 12:29:43 +01:00
Benjamin Peterson 32c49d9533 use Py_CLEAR 2012-02-19 01:11:56 -05:00
Jesus Cea f5f6af81ac Fix Test for issue #13500 2012-02-19 04:20:45 +01:00