summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge 3.6Benjamin Peterson2017-01-020-0/+0
|\
| * merge 3.5Benjamin Peterson2017-01-020-0/+0
| |\
| | * merge headsBenjamin Peterson2017-01-023-1/+9
| | |\
| * | \ merge headsBenjamin Peterson2017-01-023-1/+9
| |\ \ \
* | \ \ \ merge headsBenjamin Peterson2017-01-023-1/+9
|\ \ \ \ \
| * \ \ \ \ Issue #15812: Merge from 3.6Berker Peksag2017-01-023-1/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Issue #15812: Merge from 3.5Berker Peksag2017-01-023-1/+9
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Issue #15812: inspect.getframeinfo() now correctly shows the first line of a ↵Berker Peksag2017-01-023-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | context Patch by Sam Breese.
* | | | | | merge 3.6Benjamin Peterson2017-01-027-8/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | merge 3.5Benjamin Peterson2017-01-027-8/+9
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | merge 3.4Benjamin Peterson2017-01-027-8/+9
| | |\ \ | | | |/ | | |/|
| | | * merge 3.3Benjamin Peterson2017-01-028-9/+10
| | | |\
| | | | * ring in 2017 for PythonBenjamin Peterson2017-01-028-9/+10
| | | | |
* | | | | Issue #28985: Update authorizer constants in sqlite3 moduleBerker Peksag2017-01-022-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dates and version information from the changelog: * 2006-08-12 (3.3.7) added SQLITE_CREATE_VTABLE, SQLITE_DROP_VTABLE * 2006-10-09 (3.3.8) added SQLITE_FUNCTION * 2009-01-12 (3.6.8) added SQLITE_SAVEPOINT * 2014-02-03 (3.8.3) added SQLITE_RECURSIVE Patch by Dingyuan Wang.
* | | | | Issue #29013: Merge from 3.6Berker Peksag2017-01-021-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Issue #29013: Merge from 3.5Berker Peksag2017-01-021-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Issue #29013: Fix allowZip64 documentationBerker Peksag2017-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Zip files can be larger than 4 GiB if allowZip64 is true (default since Python 3.4)
* | | | | Issue #29012: Merge from 3.6Berker Peksag2017-01-021-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Issue #29012: Merge from 3.5Berker Peksag2017-01-021-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Issue #29012: Remove outdated information about __bases__Berker Peksag2017-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | Patch by Jim Fasarakis-Hilliard.
* | | | | Issue #29129: Merge from 3.6Berker Peksag2017-01-021-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Issue #29129: Fix typo in "Using auto" sectionBerker Peksag2017-01-021-1/+1
| | | | |
* | | | | Issue #29024: Merge from 3.6Berker Peksag2017-01-021-0/+10
|\ \ \ \ \ | |/ / / /
| * | | | Issue #29024: Merge from 3.5Berker Peksag2017-01-021-0/+10
| |\ \ \ \ | | |/ / /
| | * | | Issue #29024: Add Kivy entry to GUI FAQBerker Peksag2017-01-021-0/+10
| | | | | | | | | | | | | | | | | | | | Patch by inclement.
* | | | | Merge with 3.6Terry Jan Reedy2017-01-021-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Issue #29071: Use local flags for IDLE colorizer string prefix matcher.Terry Jan Reedy2017-01-021-4/+4
| | | | | | | | | | | | | | | | | | | | Revised re by Serhiy Storchaka.
* | | | | Issue #29094: Offsets in a ZIP file created with extern file object and modesSerhiy Storchaka2017-01-012-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | "w" and "x" now are relative to the start of the file.
| * | | | Issue #29094: Offsets in a ZIP file created with extern file object and modesSerhiy Storchaka2017-01-012-2/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | "w" and "x" now are relative to the start of the file.
| | * | | Issue #29094: Offsets in a ZIP file created with extern file object and modesSerhiy Storchaka2017-01-012-2/+6
| | | | | | | | | | | | | | | | | | | | "w" and "x" now are relative to the start of the file.
* | | | | Issue #29123: Merge from 3.6Berker Peksag2016-12-311-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Issue #29123: Merge from 3.5Berker Peksag2016-12-311-2/+1
| |\ \ \ \ | | |/ / /
| | * | | Issue #29123: Make CheckSqlTimestamp more robustBerker Peksag2016-12-311-2/+1
| | | | |
* | | | | mergeRaymond Hettinger2016-12-311-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Issue #29119: Merge in ACK from 3.5 branchRaymond Hettinger2016-12-311-0/+1
| | | | |
* | | | | mergeRaymond Hettinger2016-12-311-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | mergeRaymond Hettinger2016-12-312-2/+9
| |\ \ \ \ | | |/ / /
| | * | | Issue #29119: Fix weakref in OrderedDict.move_to_end(). Work by Andra Bogildea.Raymond Hettinger2016-12-313-2/+10
| | | | |
* | | | | Issue #26267: Merge from 3.6Berker Peksag2016-12-312-0/+11
|\ \ \ \ \ | |/ / / /
| * | | | Issue #26267: Merge from 3.5Berker Peksag2016-12-312-0/+11
| |\ \ \ \ | | |/ / /
| | * | | Issue #26267: Improve uuid.UUID documentationBerker Peksag2016-12-312-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Document how comparison of UUID objects work * Document str(uuid) returns the braceless standard form * Add a test for comparison of a UUID object with a non-UUID object Patch by Ammar Askar.
* | | | | Closes #28524: added default level for logging.disable().Vinay Sajip2016-12-313-2/+15
| | | | |
* | | | | Merged documentation update from 3.6.Vinay Sajip2016-12-311-7/+8
|\ \ \ \ \ | |/ / / /
| * | | | Closes #29105: Updated RotatingFileHandler documentation.Vinay Sajip2016-12-311-7/+8
| | | | |
* | | | | Merge 3.6.Stefan Krah2016-12-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge 3.5.Stefan Krah2016-12-301-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Issue #29111: Fix memoryview signature.Stefan Krah2016-12-301-1/+1
| | | | |
* | | | | mergeRaymond Hettinger2016-12-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Issue #29103: Remove unused import. Noticed by Jean-Sebastien Bevilacqua.Raymond Hettinger2016-12-301-1/+1
| | | | |
* | | | | mergeRaymond Hettinger2016-12-301-2/+7
|\ \ \ \ \ | |/ / / /