summaryrefslogtreecommitdiffstats
path: root/Lib
Commit message (Collapse)AuthorAgeFilesLines
* mergeRaymond Hettinger2013-09-151-0/+9
|\
| * Issue #19018: The heapq.merge() function no longer suppresses IndexErrorRaymond Hettinger2013-09-152-5/+18
| |
* | Close #18929: inspect.classify_class_attrs will now search the metaclasses ↵Ethan Furman2013-09-151-1/+6
| | | | | | | | (last) to find where an attr was defined.
* | Add __reversed__ to Enum. Minor code reorg (moved __members__ to be in ↵Ethan Furman2013-09-152-10/+20
| | | | | | | | alpha order).
* | #18856: merge with 3.3.Ezio Melotti2013-09-151-0/+21
|\ \ | |/
| * Merge heads.Ezio Melotti2013-09-151-0/+21
| |\
| | * #18856: improve test coverage of the calendar module. Patch by Madison May.Ezio Melotti2013-09-141-0/+21
| | |
* | | Avoid test_logging failure when run after test_unittest, by renaming a ↵Antoine Pitrou2013-09-141-1/+1
| | | | | | | | | | | | conflicting logger
* | | Issue #18937: Add an assertLogs() context manager to unittest.TestCase to ↵Antoine Pitrou2013-09-142-6/+199
| | | | | | | | | | | | ensure that a block of code emits a message using the logging module.
* | | #18206: Re-fix license URL.R David Murray2013-09-141-1/+2
| | |
* | | Merge #18206: Fix test for existence of license URL.R David Murray2013-09-141-20/+14
|\ \ \ | |/ / | | | | | | | | | | | | This test will fail because a previous attempt to fix a merge error in site.py was incorrect, but the test wasn't running so it wasn't caught. The next commit will fix the site.py bug.
| * | #18206: Fix test for existence of license URL.R David Murray2013-09-141-23/+15
| |/ | | | | | | | | | | It now always checks, instead of only when the LICENSE file doesn't exist. It is also protected by the 'network' resource, and uses a HEAD request since we are only doing an existence check.
* | Adjust commentAntoine Pitrou2013-09-131-1/+1
| |
* | Issue #19013: add a __main__ to unittest.test.testmock to ease CLI invocationAntoine Pitrou2013-09-131-0/+18
| |
* | Issue #19013: add a __main__ to unittest.test to ease CLI invocationAntoine Pitrou2013-09-131-0/+18
| |
* | Issue #19013: add unittest.main() epilogs to unittest.mock's own test modulesAntoine Pitrou2013-09-133-2/+4
| |
* | Issue #19013: add unittest.main() epilogs to unittest's own test modulesAntoine Pitrou2013-09-138-0/+29
| |
* | #18981: merge with 3.3.Ezio Melotti2013-09-131-1/+1
|\ \ | |/
| * #18981: fix a typo in a comment (noticed by Anoop Thomas Mathew).Ezio Melotti2013-09-131-1/+1
| |
* | Issue #16201: socket: Use inet_pton()/inet_addr() instead of ad-hoc parsing forCharles-François Natali2013-09-131-0/+14
| | | | | | | | numeric IP addresses.
* | Merge for Issue #18997: Issue #18997: fix ElementTree crash with using ↵Eli Bendersky2013-09-131-0/+12
|\ \ | |/ | | | | pickle and __getstate__.
| * Issue #18997: fix ElementTree crash with using pickle and __getstate__.Eli Bendersky2013-09-131-0/+13
| | | | | | | | Based on report and initial patch from Germán M. Bravo
* | Issue #18945: Add tests for tempfile name collision handling.Eli Bendersky2013-09-131-22/+65
|\ \ | |/ | | | | Patch by Vlad Shcherbina
| * Issue #18945: Add tests for tempfile name collision handling.Eli Bendersky2013-09-131-22/+65
| | | | | | | | Patch by Vlad Shcherbina
* | Issue #18818: The "encodingname" part of PYTHONIOENCODING is now optional.Serhiy Storchaka2013-09-131-0/+36
| |
* | Fix http.server's request handling case on trailing '/'.Senthil Kumaran2013-09-132-0/+7
|\ \ | |/ | | | | Patch contributed by Vajrasky Kok. Addresses Issue #17324
| * Fix http.server's request handling case on trailing '/'.Senthil Kumaran2013-09-132-0/+7
| | | | | | | | Patch contributed by Vajrasky Kok. Addresses Issue #17324
* | Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,Serhiy Storchaka2013-09-131-0/+2
|\ \ | |/ | | | | | | if all necessary functions are already found in libuuid. Patch by Evgeny Sologubov.
| * Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,Serhiy Storchaka2013-09-131-0/+2
| | | | | | | | | | if all necessary functions are already found in libuuid. Patch by Evgeny Sologubov.
| * Automated merge with file:///Users/skumaran/python/cpythonSenthil Kumaran2013-09-121-0/+2
| |\
* | | Removing the merge conflict markers.Senthil Kumaran2013-09-121-5/+0
| | | | | | | | | | | | - my previous removal and hg resolve mark had still left them and hooks did not catch it too!
* | | 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. Addresses issue #14927
| | * | Improve the docstring of random.shuffle. Inform users not to provide int arg.Senthil Kumaran2013-09-121-0/+2
| | | | | | | | | | | | | | | | Addresses issue #14927
* | | | Issue #18988: The "Tab" key now works when a word is already autocompleted.Serhiy Storchaka2013-09-112-7/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Issue #18988: The "Tab" key now works when a word is already autocompleted.Serhiy Storchaka2013-09-112-7/+5
| | |/ | |/|
* | | Issue #18962: Optimize the single iterator case for heapq.merge()Raymond Hettinger2013-09-111-5/+9
| |/ |/| | | | | Suggested by Wouter Bolsterlee.
* | Get "stopped" back into repr(Thread) when appropriate.Tim Peters2013-09-092-0/+26
| | | | | | | | | | | | | | | | | | | | Due to recent changes, a Thread doesn't know that it's over before someone calls .join() or .is_alive(). That meant repr(Thread) continued to include "started" (and not "stopped") before one of those methods was called, even if hours passed since the thread ended. Repaired that.
* | Another stab at the thread cleanup patch.Tim Peters2013-09-091-3/+26
| | | | | | | | | | | | | | | | | | | | Antoine Pitrou found a variation that worked for him on the thread+fork tests, and added an important self._is_stopped = True to the after-fork code. I confess I don't know why things passed before. But then mixing fork with threads is insane ;-)
* | Backed out changeset 1f5a7853680cTim Peters2013-09-091-26/+5
| | | | | | | | Unixy buildbots were failing the thread + fork tests :-(
* | Minor cleanup of the new scheme for detecting thread termination.Tim Peters2013-09-091-5/+26
| | | | | | | | Documented some obscurities, and assert'ed ._stop()'s crucial precondition.
* | Merge.Larry Hastings2013-09-0914-208/+294
|\ \
| * \ Merge docstring typo fix from 3.3Mark Dickinson2013-09-091-1/+1
| |\ \ | | |/
| | * Docstring typo fix: Arithmentic -> Arithmetic.Mark Dickinson2013-09-091-1/+1
| | |
| * | Issue 18984: Remove ._stopped Event from Thread internals.Tim Peters2013-09-082-167/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for issue 18808 left us checking two things to be sure a Thread was done: an Event (._stopped) and a mutex (._tstate_lock). Clumsy & brittle. This patch removes the Event, leaving just a happy lock :-) The bulk of the patch removes two excruciating tests, which were verifying sanity of the internals of the ._stopped Event after a fork. Thanks to Antoine Pitrou for verifying that's the only real value these tests had. One consequence of moving from an Event to a mutex: waiters (threads calling Thread.join()) used to block each on their own unique mutex (internal to the ._stopped event), but now all contend on the same mutex (._tstate_lock). These approaches have different performance characteristics on different platforms. I don't think it matters in this context.
| * | 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
| | | | | | | | | | | | module is present (to record skipped tests)
| * | Issue #18808 again: fix the after-fork logic for not-yet-started or ↵Antoine Pitrou2013-09-082-10/+8
| | | | | | | | | | | | | | | | | | already-stopped threads. (AFAICT, in theory, we must reset all the locks, not just those in use)
| * | Merge.Charles-François Natali2013-09-083-14/+82
| |\ \