summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* null merge from 2.6Barry Warsaw2012-02-220-0/+0
|\
| * 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
* | null merge from 2.6Barry Warsaw2012-02-220-0/+0
|\ \ | |/
| * 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).
* | Fix (presumably) test_hash under big-endian systems (PPC).Antoine Pitrou2012-02-221-2/+8
| |
* | Issue #14053: Fix "make patchcheck" to work with MQ.Nadeem Vawda2012-02-223-0/+20
| | | | | | | | Patch by Francisco Martín Brugué
* | Avoid py3k warnings related to sort() of unrelated types.Antoine Pitrou2012-02-211-3/+7
| |
* | merge with 2.6Georg Brandl2012-02-213-5/+5
|\ \ | |/
| * Remove reST markup from --help output. Also: O(n**2) is dict construction, ↵Georg Brandl2012-02-213-5/+5
| | | | | | | | not single insertion.
* | Fix flaky os.urandom test.Antoine Pitrou2012-02-211-3/+4
| |
* | merge 2.6Benjamin Peterson2012-02-211-6/+0
|\ \ | |/
| * don't need this hack anymoreBenjamin Peterson2012-02-211-6/+0
| |
* | Null mergeAntoine Pitrou2012-02-210-0/+0
|\ \ | |/
| * Fix crash at startup with -W options.Antoine Pitrou2012-02-215-4/+39
| |
* | Fix crash at startup with -W options.Antoine Pitrou2012-02-215-4/+39
| |
* | Issue #6807: Run msisupport.mak earlier.Martin v. Löwis2012-02-212-2/+4
| |
* | merge 2.6Benjamin Peterson2012-02-214-4/+14
|\ \ | |/
| * merge headsBenjamin Peterson2012-02-211-0/+6
| |\
| * | ensure no one tries to hash things before the random seed is foundBenjamin Peterson2012-02-214-4/+14
| | |
* | | merge 2.7Barry Warsaw2012-02-210-0/+0
|\ \ \
| * \ \ merge 2.6Barry Warsaw2012-02-210-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Backport fix from default branch for ./python -R -Wd where hash('d') would notBarry Warsaw2012-02-211-0/+6
| | |/ | | | | | | | | | have gotten randomized.
* | | Issue #10580: Minor grammar change in Windows installer.Martin v. Löwis2012-02-212-1/+3
|/ /
* | null merge from 2.6Barry Warsaw2012-02-210-0/+0
|\ \ | |/
| * Let's sort the keys so that this test passes even with random hashes.Barry Warsaw2012-02-211-1/+1
| |
* | carefully don't depend on any dict orderBenjamin Peterson2012-02-211-4/+16
| |
* | remove extra zeroBenjamin Peterson2012-02-211-1/+1
| |
* | sqlite3: Fix 64-bit integer handling in user functions on 32-bit architecturesPetri Lehtinen2012-02-214-5/+30
| | | | | | | | Closes #8033.
* | HTMLParser is now able to handle slashes in the start tag.Ezio Melotti2012-02-213-5/+28
| |
* | kill interned strings computed before random initializationBenjamin Peterson2012-02-211-0/+6
| |
* | don't rely on dict orderBenjamin Peterson2012-02-211-2/+4
| |
* | a frozenset is better hereBenjamin Peterson2012-02-211-1/+2
| |
* | use setBenjamin Peterson2012-02-211-4/+1
| |
* | don't rely on dict orderBenjamin Peterson2012-02-211-1/+1
| |
* | this was supposed to dieBenjamin Peterson2012-02-212-16/+2
| |
* | fix for real this time...Benjamin Peterson2012-02-211-1823/+5
| |
* | belately resolve conflicts hereBenjamin Peterson2012-02-211-2/+0
| |
* | fix test_gdb under hash randomizationBenjamin Peterson2012-02-211-6/+11
| |
* | don't rely on dict order hereBenjamin Peterson2012-02-211-1/+1
| |
* | merge 2.6 with hash randomization fixBenjamin Peterson2012-02-2126-139/+2502
|\ \ | |/
| * 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.
* | don't rely on the order of module clearingBenjamin Peterson2012-02-201-1/+1
| |
* | null merge from 2.6Barry Warsaw2012-02-200-0/+0
|\ \
| * \ null merge from 2.6Barry Warsaw2012-02-200-0/+0
| |\ \ | | |/
| | * Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py.Barry Warsaw2012-02-201-0/+1
| | |
* | | logging: clarified documentation for Handler.handleError.Vinay Sajip2012-02-201-6/+8
|/ /
* | Add missing “::” markup and wrap overlong linesÉric Araujo2012-02-201-18/+23
| |
* | Fix typoÉric Araujo2012-02-201-1/+1
| |
* | don't split 'Hye-Shik Chang' name; thanks to Sergey from docs@Sandro Tosi2012-02-191-3/+3
| |