summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge 3.5Yury Selivanov2015-08-051-5/+14
|\
| * whatsnew/3.5: Mention new ssl memory bioYury Selivanov2015-08-051-5/+14
| |
* | Merge 3.5 (issue #24791; more tests in test_parser)Yury Selivanov2015-08-051-0/+2
|\ \ | |/
| * Issue #24791: More tests in test_parserYury Selivanov2015-08-051-0/+2
| |
* | Merge 3.5 (issue #24791)Yury Selivanov2015-08-055-38/+42
|\ \ | |/
| * Issue #24791: Fix grammar regression for call syntax: 'g(*a or b)'.Yury Selivanov2015-08-056-38/+44
| |
* | Merge with 3.5Steve Dower2015-08-052-0/+0
|\ \ | |/
| * Rebuild wininst-14.0[-amd64].exe with updated tools.Steve Dower2015-08-052-0/+0
| |
* | Merge 3.5 (asyncio)Yury Selivanov2015-08-051-0/+4
|\ \ | |/
| * asyncio.test_pep492: Add a test for asyncio.iscoroutinefunctionYury Selivanov2015-08-051-0/+4
| |
* | Merge with 3.5Steve Dower2015-08-051-11/+12
|\ \ | |/
| * Fixes make_zip.py to create temporary .pyc files in a separate directory. ↵Steve Dower2015-08-051-11/+12
| | | | | | | | This avoids polluting tests that run code from TEMP.
* | Merge 3.5 (asyncio)Yury Selivanov2015-08-051-1/+6
|\ \ | |/
| * Merge 3.4 (asyncio)Yury Selivanov2015-08-051-1/+6
| |\
| | * asyncio: Make sure BaseException is re-raised in SSLProtocolYury Selivanov2015-08-051-1/+6
| | |
* | | Issue #23812: Fix asyncio.Queue.get() to avoid loosing items on cancellation.Yury Selivanov2015-08-052-10/+98
|\ \ \ | |/ / | | | | | | Patch by Gustavo J. A. M. Carneiro.
| * | Issue #23812: Fix asyncio.Queue.get() to avoid loosing items on cancellation.Yury Selivanov2015-08-053-10/+101
| |\ \ | | |/ | | | | | | Patch by Gustavo J. A. M. Carneiro.
| | * Issue #23812: Fix asyncio.Queue.get() to avoid loosing items on cancellation.Yury Selivanov2015-08-053-10/+101
| | | | | | | | | | | | Patch by Gustavo J. A. M. Carneiro.
* | | Merge 3.5Yury Selivanov2015-08-051-1/+2
|\ \ \ | |/ /
| * | whatsnew/3.5: Mention 'typing' module docs in seealso for pep 484Yury Selivanov2015-08-051-1/+2
| | |
* | | Merge issue #24129 from 3.5Nick Coghlan2015-08-053-62/+107
|\ \ \ | |/ /
| * | Merge issue #24129 from 3.4Nick Coghlan2015-08-053-62/+107
| |\ \ | | |/
| | * Issue #24129: Clarify reference docs for name resolution.Nick Coghlan2015-08-053-62/+107
| | | | | | | | | | | | | | | | | | | | | | | | This includes removing the assumption that readers will be familiar with the name resolution scheme Python used prior to the introduction of lexical scoping for function namespaces. Patch by Ivan Levkivskyi.
* | | Fix trailing ws (merge from 3.5).Guido van Rossum2015-08-051-9/+9
|\ \ \ | |/ /
| * | Fix trailing ws.Guido van Rossum2015-08-051-9/+9
| | |
| * | Merge docs for typing.py from accidental branch.Guido van Rossum2015-08-051-0/+415
| |\ \
* | \ \ Merge docs for typing.py from 3.5 into default branch.Guido van Rossum2015-08-051-0/+415
|\ \ \ \
| * \ \ \ Issue #24272: Initial docs for typing.py (PEP 484). (Merge from 3.5.)Guido van Rossum2015-08-031-0/+415
| |\ \ \ \ | | | |/ / | | |/| | | | | | | By Daniel Andrade Groppe and Ivan Levkivskyi.
| | * | | Issue #24272: Initial docs for typing.py (PEP 484).Guido van Rossum2015-08-031-0/+415
| | | | | | | | | | | | | | | | | | | | By Daniel Andrade Groppe and Ivan Levkivskyi.
* | | | | Issue #23973: Update typing.py from GitHub repo. (Merge from 3.5.)Guido van Rossum2015-08-053-11/+74
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Issue #23973: Update typing.py from GitHub repo.Guido van Rossum2015-08-053-348/+152
| | | | |
* | | | | Null mergeZachary Ware2015-08-040-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Null mergeZachary Ware2015-08-040-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Issue #24791: Add tests for things that regressed with PEP 448Zachary Ware2015-08-041-0/+2
| | | | |
* | | | | Closes #24751: Merge with 3.5Zachary Ware2015-08-042-1/+15
|\ \ \ \ \ | |/ / / /
| * | | | Issue #24751: Merge with 3.4Zachary Ware2015-08-042-1/+15
| |\ \ \ \ | | |/ / /
| | * | | Issue #24751: When running regrtest with '-w', don't fail if re-run succeeds.Zachary Ware2015-08-042-3/+12
| | | | |
* | | | | Puts compiled pyc files into embedded library ZIP file instead of sources.Steve Dower2015-08-041-1/+11
|\ \ \ \ \ | |/ / / /
| * | | | Puts compiled pyc files into embedded library ZIP file instead of sources.Steve Dower2015-08-041-1/+11
| | | | |
* | | | | Issue #20769: Improve reload() docs. Patch by Dorian Pula.Robert Collins2015-08-053-5/+8
|\ \ \ \ \ | |/ / / /
| * | | | Issue #20769: Improve reload() docs. Patch by Dorian Pula.Robert Collins2015-08-053-5/+8
| |\ \ \ \ | | |/ / /
| | * | | Issue #20769: Improve reload() docs. Patch by Dorian Pula.Robert Collins2015-08-053-5/+8
| | | | |
* | | | | Merge 3.5Yury Selivanov2015-08-047-16/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge 3.4Yury Selivanov2015-08-047-16/+14
| |\ \ \ \ | | |/ / /
| | * | | asyncio: Sync with upstream (compat module)Yury Selivanov2015-08-047-16/+14
| | | | |
* | | | | Merge 3.5Yury Selivanov2015-08-041-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge 3.4Yury Selivanov2015-08-041-1/+1
| |\ \ \ \ | | |/ / /
| | * | | asyncio: Sync with mainstreamYury Selivanov2015-08-041-1/+1
| | | | |
* | | | | Merge 3.5 (whatsnew)Yury Selivanov2015-08-041-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | whatsnew: Add pep 448 to new syntax features sectionYury Selivanov2015-08-041-0/+1
| | | | |