summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump some more copyright years (as per PEP 101), since this is the firstv2.6.8rc1Barry Warsaw2012-02-236-4/+7
* Bump to version 2.6.8rc1.Barry Warsaw2012-02-237-15/+16
* Back port from 2.7:Barry Warsaw2012-02-221-2/+5
* Backport from 2.7:Barry Warsaw2012-02-221-3/+4
* Backport from 2.7 branch.Barry Warsaw2012-02-221-2/+8
* Remove reST markup from --help output. Also: O(n**2) is dict construction, n...Georg Brandl2012-02-213-5/+5
* 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-214-4/+14
|\
| * ensure no one tries to hash things before the random seed is foundBenjamin Peterson2012-02-214-4/+14
* | Backport fix from default branch for ./python -R -Wd where hash('d') would notBarry Warsaw2012-02-211-0/+6
|/
* Let's sort the keys so that this test passes even with random hashes.Barry Warsaw2012-02-211-1/+1
* Whitespace normalizationBarry Warsaw2012-02-201-1/+1
* - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEEDBarry Warsaw2012-02-2027-151/+705
* 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
* Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC IV ...Antoine Pitrou2012-01-272-1/+5
* 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-281-3/+3
* | update profile license (closes #12417)Benjamin Peterson2011-06-272-48/+28
* | Replay svn r88852.Barry Warsaw2011-06-032-1/+13
* | Replay svn r88850.v2.6.7Barry Warsaw2011-06-037-26/+14
* | Nearly null-merge 2.5.6Martin v. Löwis2011-05-280-0/+0
|\ \ | |/
| * merge 2.5.6c1 tagMartin v. Löwis2011-05-280-0/+0
| |\
| | * Added tag v2.5.6c1 for changeset a87c7b96672bMartin v. Löwis2011-05-280-0/+0
| * | Added tag v2.5.6 for changeset de34c7b097e8Martin v. Löwis2011-05-280-0/+0
| * | 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
| |/
| * 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
* | Replay changeset 70248:c714e2f92f63 from fubar branch. Original commitBarry Warsaw2011-05-237-7/+26
* | Replay changeset 70238:03e488b5c009 from fubar branch. Original commitBarry Warsaw2011-05-2316-35/+45
* | These files have Windows line endings in 2.6.Barry Warsaw2011-05-221-0/+6
* | Closes #11786: ConfigParser.[Raw]ConfigParser optionxform().Łukasz Langa2011-04-281-5/+7
* | merge 11442 NEWSMartin v. Löwis2011-04-173256-458954/+656654
|\ \ | |/ |/|
| * Merge cleanup.Guido van Rossum2011-03-293-16/+6
| |\
| | * Merge issue 11662 from 2.5.Guido van Rossum2011-03-295-13/+60
| | |\
| | * | Issue #11639: Configuration function documentation referred to logging.XXX ra...Vinay Sajip2011-03-291-0/+4
| * | | Merge urllib/urllib2 security fix from 2.5 branch.guido2011-03-295-0/+61
| |\ \ \ | | |/ / | |/| / | | |/
| * | null mergeMartin v. Löwis2011-03-213256-458926/+656702
| |\ \
| | * \ Whoops. The copyright should be two lines (merge from 2.5).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
| | |\ \ \
| | * \ \ \ merge from 2.5 branch.Senthil Kumaran2011-03-173256-458923/+656704
| | |\ \ \ \
| | | * | | | Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which...Vinay Sajip2011-03-113-121/+5
| | | * | | | Issue #11444: Lock handlers while flushing/closing during shutdown.Vinay Sajip2011-03-081-0/+3
| | | * | | | Issue #11424: Fix bug in determining child loggers.Vinay Sajip2011-03-072-5/+118
| | | * | | | Merge tags from 2.5.Georg Brandl2011-03-050-0/+0
| | | |\ \ \ \
| | | * \ \ \ \ Dummy-merge 2.5 branch into 2.6 branch.Georg Brandl2011-03-053256-458923/+656704
| | | |\ \ \ \ \