summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removing the merge conflict markers.Senthil Kumaran2013-09-121-5/+0
* Automated merge with ssh://hg.python.org/cpythonSenthil Kumaran2013-09-121-0/+7
|\
| * merge from 3.3Senthil Kumaran2013-09-121-0/+7
| |\
| | * Improve the docstring of random.shuffle. Inform users not to provide int arg.Senthil Kumaran2013-09-121-0/+2
* | | Issue #18988: The "Tab" key now works when a word is already autocompleted.Serhiy Storchaka2013-09-113-7/+10
|\ \ \
| * | | Issue #18988: The "Tab" key now works when a word is already autocompleted.Serhiy Storchaka2013-09-113-7/+7
| | |/ | |/|
* | | Issue #18962: Optimize the single iterator case for heapq.merge()Raymond Hettinger2013-09-112-5/+10
| |/ |/|
* | merge from 3.3Senthil Kumaran2013-09-101-2/+3
|\ \ | |/
| * Clarify mmap.close method behavior. Addresses issue #18815Senthil Kumaran2013-09-101-2/+3
* | merge from 3.3Senthil Kumaran2013-09-101-1/+10
|\ \ | |/
| * Document Fraction's numerator and denominator properties.Senthil Kumaran2013-09-101-1/+10
* | Get "stopped" back into repr(Thread) when appropriate.Tim Peters2013-09-092-0/+26
* | Another stab at the thread cleanup patch.Tim Peters2013-09-091-3/+26
* | Backed out changeset 1f5a7853680cTim Peters2013-09-091-26/+5
* | Minor cleanup of the new scheme for detecting thread termination.Tim Peters2013-09-091-5/+26
* | Merge.Larry Hastings2013-09-0931-364/+529
|\ \
| * \ Merge docstring typo fix from 3.3Mark Dickinson2013-09-091-1/+1
| |\ \ | | |/
| | * Docstring typo fix: Arithmentic -> Arithmetic.Mark Dickinson2013-09-091-1/+1
| * | mergeRaymond Hettinger2013-09-090-0/+0
| |\ \ | | |/
| | * Issue 18752: Make chain.from_iterable() more visible in the documentation.Raymond Hettinger2013-09-092-1/+3
| * | mergeRaymond Hettinger2013-09-091-2/+3
| |\ \
| | * | Close #18980: Enum doc fixes. Patch from Elazar Gershuni.Ethan Furman2013-09-091-2/+3
| * | | mergeRaymond Hettinger2013-09-091-2/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Issue 18301: The classmethod decorator didn't fit well with the rough-equiva...Raymond Hettinger2013-09-091-2/+1
| * | Issue 18752: Make chain.from_iterable() more visible in the documentation.Raymond Hettinger2013-09-092-1/+3
| * | Issue 18984: Remove ._stopped Event from Thread internals.Tim Peters2013-09-082-167/+30
| * | Fix a typo. (closes #18953)Serhiy Storchaka2013-09-081-1/+1
| |\ \ | | |/
| | * Fix a typo. (closes #18953)Serhiy Storchaka2013-09-081-1/+1
| * | Fixed tests with Tcl/Tk <8.5 (closes #18964).Serhiy Storchaka2013-09-081-4/+18
| |\ \ | | |/
| | * Fixed tests with Tcl/Tk <8.5 (closes #18964).Serhiy Storchaka2013-09-081-4/+18
| * | Issue #18904: test_os and test_socket use unittest.skipIf() to check if fcntlVictor Stinner2013-09-082-46/+48
| * | Issue #18808 again: fix the after-fork logic for not-yet-started or already-s...Antoine Pitrou2013-09-082-10/+8
| * | Merge.Charles-François Natali2013-09-086-23/+101
| |\ \
| | * | Issue #18904: test_socket: add inheritance tests using fcntl and FD_CLOEXECVictor Stinner2013-09-081-0/+30
| | * | Issue #18904: Improve os.get/set_inheritable() testsVictor Stinner2013-09-081-7/+29
| | * | Close #18957: The PYTHONFAULTHANDLER environment variable now only enables theVictor Stinner2013-09-084-16/+42
| * | | Issue #18963: skip test_selectors.test_above_fd_setsize on older OS X versions.Charles-François Natali2013-09-081-0/+2
| * | | Issue #18935: Fix test_regrtest.test_timeout when built --without-threads (theCharles-François Natali2013-09-081-0/+3
| |/ /
| * | Issue #18963: Fix test_selectors.test_above_fd_setsize on OS X, where theCharles-François Natali2013-09-081-2/+1
| * | Issue #18934: Use poll/select-based selectors for multiprocessing.Connection,Charles-François Natali2013-09-081-1/+9
| * | Put the defines in the logical section and fix indentation.Raymond Hettinger2013-09-081-8/+8
| * | merge from 3.3Senthil Kumaran2013-09-081-1/+1
| |\ \ | | |/
| | * Fix the dead link of IEEE_854-1987 standard with the Wikipedia entry.Senthil Kumaran2013-09-081-1/+1
| * | Minor code beautification.Raymond Hettinger2013-09-081-6/+5
| * | Improve code clarity by removing two unattractive macros.Raymond Hettinger2013-09-081-16/+18
| * | Remove the freelist scheme for setobjects.Raymond Hettinger2013-09-083-49/+8
| * | Merge #18952 fix from 3.3Nick Coghlan2013-09-083-13/+36
| |\ \ | | |/
| | * Close #18952: correctly download test support dataNick Coghlan2013-09-083-13/+27
| * | Issue 18808: blind attempt to repair some buildbot failures.Tim Peters2013-09-081-1/+6
| * | merge from 3.3Senthil Kumaran2013-09-081-3/+5
| |\ \ | | |/