Commit Graph

80645 Commits

Author SHA1 Message Date
Ezio Melotti 92ed89081e #18951: merge with 3.3. 2013-09-13 22:18:02 +03:00
Ezio Melotti 560a77881b #18951: use consistent names in unittest docs. 2013-09-13 22:17:40 +03:00
Charles-François Natali 0cc86850b6 Issue #16201: socket: Use inet_pton()/inet_addr() instead of ad-hoc parsing for
numeric IP addresses.
2013-09-13 19:53:08 +02:00
Eli Bendersky 12f18289c0 Merge for Issue #18997: Issue #18997: fix ElementTree crash with using pickle and __getstate__. 2013-09-13 06:27:52 -07:00
Eli Bendersky 61f4cd1dd5 Add Germán M. Bravo to Misc/ACKS 2013-09-13 06:24:59 -07:00
Eli Bendersky dd3661e782 Issue #18997: fix ElementTree crash with using pickle and __getstate__.
Based on report and initial patch from Germán M. Bravo
2013-09-13 06:24:25 -07:00
Eli Bendersky 7290608af7 Issue #18945: Add tests for tempfile name collision handling.
Patch by Vlad Shcherbina
2013-09-13 05:30:00 -07:00
Eli Bendersky aa04f9ae7d Issue #18945: Add tests for tempfile name collision handling.
Patch by Vlad Shcherbina
2013-09-13 05:28:20 -07:00
Serhiy Storchaka bf28d2dcad Issue #18818: The "encodingname" part of PYTHONIOENCODING is now optional. 2013-09-13 11:46:24 +03:00
Senthil Kumaran 187b063005 Fix http.server's request handling case on trailing '/'.
Patch contributed by Vajrasky Kok. Addresses Issue #17324
2013-09-13 00:22:45 -07:00
Senthil Kumaran 72c238e21a Fix http.server's request handling case on trailing '/'.
Patch contributed by Vajrasky Kok. Addresses Issue #17324
2013-09-13 00:21:18 -07:00
Serhiy Storchaka 5abf3d9926 Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,
if all necessary functions are already found in libuuid.
Patch by Evgeny Sologubov.
2013-09-13 07:49:36 +03:00
Serhiy Storchaka 016af3f4d4 Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,
if all necessary functions are already found in libuuid.
Patch by Evgeny Sologubov.
2013-09-13 07:46:40 +03:00
Senthil Kumaran f5ce0122ce Removing the merge conflict markers.
- my previous removal and hg resolve mark had still left them and hooks did not catch it too!
2013-09-12 07:06:49 -07:00
Senthil Kumaran d184f664e3 Automated merge with file:///Users/skumaran/python/cpython 2013-09-11 22:56:30 -07:00
Senthil Kumaran b5651edaf1 Automated merge with ssh://hg.python.org/cpython 2013-09-11 22:56:28 -07:00
Senthil Kumaran b4055f294e merge from 3.3
Improve the docstring of random.shuffle. Inform users not to provide int arg.
Addresses issue #14927
2013-09-11 22:55:54 -07:00
Senthil Kumaran f8ce51ab16 Improve the docstring of random.shuffle. Inform users not to provide int arg.
Addresses issue #14927
2013-09-11 22:54:31 -07:00
Serhiy Storchaka fa7d3b13a3 Issue #18988: The "Tab" key now works when a word is already autocompleted. 2013-09-11 22:48:52 +03:00
Serhiy Storchaka dd4754e6a8 Issue #18988: The "Tab" key now works when a word is already autocompleted. 2013-09-11 22:46:27 +03:00
Raymond Hettinger f27623215c Issue #18962: Optimize the single iterator case for heapq.merge()
Suggested by Wouter Bolsterlee.
2013-09-11 01:15:40 -05:00
Senthil Kumaran aa1004da97 merge from 3.3
Clarify mmap.close method  behavior.  Addresses issue  #18815
Patch contributed by Anoop Thomas Mathew.
2013-09-09 22:40:13 -07:00
Senthil Kumaran b9183950d8 Clarify mmap.close method behavior. Addresses issue #18815
Patch contributed by Anoop Thomas Mathew.
2013-09-09 22:39:28 -07:00
Senthil Kumaran 8a7687a631 merge from 3.3
Document Fraction's numerator and denominator properties.
Addresses issue #18800
2013-09-09 19:58:20 -07:00
Senthil Kumaran b505a6ac91 Document Fraction's numerator and denominator properties.
Addresses issue #18800
2013-09-09 19:57:37 -07:00
Tim Peters 72460fa68b Get "stopped" back into repr(Thread) when appropriate.
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.
2013-09-09 18:48:24 -05:00
Tim Peters b5e9ac9ec6 Another stab at the thread cleanup patch.
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 ;-)
2013-09-09 14:41:50 -05:00
Tim Peters 7875523f16 Backed out changeset 1f5a7853680c
Unixy buildbots were failing the thread + fork tests :-(
2013-09-09 13:47:16 -05:00
Tim Peters 7a6054b19d Minor cleanup of the new scheme for detecting thread termination.
Documented some obscurities, and assert'ed ._stop()'s crucial precondition.
2013-09-09 12:57:10 -05:00
Larry Hastings 8568f66daf Merge. 2013-09-09 21:12:21 +09:00
Larry Hastings 60560b18d2 Post-3.4.0a2-release fixups. 2013-09-09 21:08:52 +09:00
Mark Dickinson 23543ebd86 Merge docstring typo fix from 3.3 2013-09-09 10:34:56 +01:00
Mark Dickinson 51ef074d57 Docstring typo fix: Arithmentic -> Arithmetic. 2013-09-09 10:34:24 +01:00
Raymond Hettinger 42d9ea12b6 merge 2013-09-09 02:02:05 -05:00
Raymond Hettinger fb92f393b0 Issue 18752: Make chain.from_iterable() more visible in the documentation. 2013-09-09 02:01:35 -05:00
Raymond Hettinger 223b9c36ad merge 2013-09-09 01:55:31 -05:00
Raymond Hettinger ee09458e08 merge 2013-09-09 01:55:07 -05:00
Raymond Hettinger 1e21ebcc2a Issue 18301: The classmethod decorator didn't fit well with the rough-equivalent example code. 2013-09-09 01:54:27 -05:00
Ethan Furman 455bfdea2f Close #18980: Enum doc fixes. Patch from Elazar Gershuni. 2013-09-08 23:48:34 -07:00
Raymond Hettinger 8df58f7ae8 Issue 18752: Make chain.from_iterable() more visible in the documentation. 2013-09-09 01:29:40 -05:00
Tim Peters c363a23eff Issue 18984: Remove ._stopped Event from Thread internals.
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.
2013-09-08 18:44:40 -05:00
Serhiy Storchaka 050b62d1a6 Fix a typo. (closes #18953) 2013-09-08 20:43:02 +03:00
Serhiy Storchaka c700180443 Fix a typo. (closes #18953) 2013-09-08 20:42:13 +03:00
Serhiy Storchaka d86709ce91 Fixed tests with Tcl/Tk <8.5 (closes #18964). 2013-09-08 20:31:20 +03:00
Serhiy Storchaka dfa689bfdd Fixed tests with Tcl/Tk <8.5 (closes #18964). 2013-09-08 20:29:37 +03:00
Victor Stinner 4f7a36f84f Issue #18904: test_os and test_socket use unittest.skipIf() to check if fcntl
module is present (to record skipped tests)
2013-09-08 14:14:38 +02:00
Antoine Pitrou 5da7e7959e Issue #18808 again: fix the after-fork logic for not-yet-started or already-stopped threads.
(AFAICT, in theory, we must reset all the locks, not just those in use)
2013-09-08 13:19:06 +02:00
Charles-François Natali 6f6f4865d1 Merge. 2013-09-08 12:35:53 +02:00
Charles-François Natali 807ba8552a Issue #18963: skip test_selectors.test_above_fd_setsize on older OS X versions. 2013-09-08 12:31:32 +02:00
Charles-François Natali 833bf1fcb2 Issue #18935: Fix test_regrtest.test_timeout when built --without-threads (the
'--timeout' option requires faulthandler.dump_traceback_later).
2013-09-08 12:27:33 +02:00