summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Issue #10405: merge from 3.3Ned Deily2012-10-202-13/+51
|\
| * Issue #10405: merge from 3.2Ned Deily2012-10-202-13/+51
| |\
| | * Issue #10405: Document IDLE context menus in Standard Library documentNed Deily2012-10-202-13/+51
| | | | | | | | | | | | | | | | | | and IDLE Help file. (Thanks to Nick ODell and Todd Rovito for suggestions.) Update Debug menu options in docs to match current code plus various other minor IDLE doc and help edits.
* | | Merge punctuation fixes with 3.3.Ezio Melotti2012-10-201-2/+2
|\ \ \ | |/ /
| * | Fix punctuation.Ezio Melotti2012-10-201-2/+2
| | |
* | | Merge "seealso" change with 3.3.Ezio Melotti2012-10-201-3/+1
|\ \ \ | |/ /
| * | Move note about the implementation in the "seealso".Ezio Melotti2012-10-201-3/+1
| | |
* | | Fix concurrent.futures docstring typo: "Request Q" -> "Result Q".Mark Dickinson2012-10-201-1/+1
| | |
* | | Merge from 3.3Nick Coghlan2012-10-201-1/+1
|\ \ \ | |/ /
| * | Fix typo in example (pointed out by a couple of people, most recently Ken Rimey)Nick Coghlan2012-10-201-1/+1
| | |
* | | Propagate dummy merge from 3.3Nick Coghlan2012-10-200-0/+0
|\ \ \ | |/ /
| * | Dummy merge from 3.2Nick Coghlan2012-10-200-0/+0
| |\ \ | | |/
| | * Fix compilation on WindowsNick Coghlan2012-10-201-1/+1
| | |
* | | Merge wrong escape removal with 3.3.Ezio Melotti2012-10-191-1/+1
|\ \ \ | |/ /
| * | Remove wrong escape in code snippet.Ezio Melotti2012-10-191-1/+1
| | |
* | | Propagate dummy merge from 3.3Nick Coghlan2012-10-190-0/+0
|\ \ \ | |/ /
| * | Dummy merge from 3.2Nick Coghlan2012-10-190-0/+0
| |\ \ | | |/
| | * Fix broken test and replace redundant generator with a tupleNick Coghlan2012-10-191-9/+13
| | |
* | | Propagate dummy merge from 3.3Nick Coghlan2012-10-190-0/+0
|\ \ \ | |/ /
| * | Dummy merge from 3.2Nick Coghlan2012-10-190-0/+0
| |\ \ | | |/
| | * Issue #6074: Actually delete the source file in the test as intendedNick Coghlan2012-10-191-1/+1
| | |
* | | Merge from 3.3Nick Coghlan2012-10-191-1/+0
|\ \ \ | |/ /
| * | Remove unused importNick Coghlan2012-10-191-1/+0
| | |
* | | Merge fix from #6074 from 3.3Nick Coghlan2012-10-194-1925/+1990
|\ \ \ | |/ /
| * | Issue #6074: Apply an appropriate fix for importlib based importsNick Coghlan2012-10-194-1933/+1998
| | |
* | | Propagate dummy merge from 3.3Nick Coghlan2012-10-190-0/+0
|\ \ \ | |/ /
| * | Dummy merge from 3.2, as that approach to resolving #6074 is not applicable ↵Nick Coghlan2012-10-190-0/+0
| |\ \ | | |/ | | | | | | to importlib
| | * Issue #6074: Forward port Windows read-only source file fix from 2.7Nick Coghlan2012-10-193-5/+60
| | |
| | * Fix issue #16270: urllib may hang when used for retrieving files via FTP by ↵Giampaolo Rodola'2012-10-192-6/+3
| | | | | | | | | | | | using a context manager.
| * | Fix issue #16270: urllib may hang when used for retrieving files via FTP by ↵Giampaolo Rodola'2012-10-192-6/+3
| | | | | | | | | | | | using a context manager.
* | | Fix issue #16270: urllib may hang when used for retrieving files via FTP by ↵Giampaolo Rodola'2012-10-192-6/+3
| | | | | | | | | | | | using a context manager.
* | | Merge with 3.3Georg Brandl2012-10-191-318/+0
|\ \ \ | |/ /
| * | Fix merging mistake.Georg Brandl2012-10-191-318/+0
| | |
* | | Issue #16226: Fix IDLE Path Browser crash.Ned Deily2012-10-192-1/+8
|\ \ \ | |/ / | | | | | | (Patch by Roger Serwy)
| * | Issue #16226: Fix IDLE Path Browser crash.Ned Deily2012-10-192-1/+8
| | | | | | | | | | | | (Patch by Roger Serwy)
* | | Issue 16280: Drop questionable special-casing of null pointer in ↵Mark Dickinson2012-10-181-6/+0
| | | | | | | | | | | | PyLong_FromVoidPtr.
* | | Followup to issue #15958: add join.h to Makefile dependencies for byte stringsAntoine Pitrou2012-10-181-0/+1
| | | | | | | | | | | | (thanks Serhiy).
* | | Issue #16277: merge fix from 3.3Mark Dickinson2012-10-181-0/+8
|\ \ \ | |/ /
| * | Issue #16277: merge fix from 3.2Mark Dickinson2012-10-181-0/+8
| |\ \ | | |/
| | * Issue #16277: in PyLong_FromVoidPtr, add missing branch for sizeof(void*) <= ↵Mark Dickinson2012-10-181-0/+8
| | | | | | | | | | | | sizeof(long).
* | | Merge from 3.3: clarify universal-newline wording in tutorial (issue #16266).Chris Jerdonek2012-10-181-3/+4
|\ \ \ | |/ / | | | | | | This also null merges from a previous commit.
| * | Merge from 3.2: clarify universal-newline wording in tutorial (issue #16266).Chris Jerdonek2012-10-181-3/+4
| |\ \ | | |/
| | * Clarify universal-newline wording in tutorial (issue #16266).Chris Jerdonek2012-10-181-3/+4
| | |
| * | Merge heads.Trent Nelson2012-10-175-4/+327
| |\ \
* | \ \ Merge heads.Trent Nelson2012-10-1719-112/+4504
|\ \ \ \
| * | | | Issue #16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unifiedChristian Heimes2012-10-1715-108/+79
| | | | | | | | | | | | | | | | | | | | endianess detection and handling.
| * | | | merge headsAndrew Svetlov2012-10-171-0/+4416
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merge headsAndrew Svetlov2012-10-171-0/+318
| | |\ \ \ | | | | |/ | | | |/|
| | | * | null mergeAndrew Svetlov2012-10-172-2/+5
| | | |\ \
| | * | \ \ null mergeAndrew Svetlov2012-10-172-2/+5
| | |\ \ \ \