Commit graph

32666 commits

Author SHA1 Message Date
Serhiy Storchaka
b3955fe0c4 Issue #19029: Change non-existing since 3.0 StringType to str. 2013-09-16 11:03:59 +03:00
Serhiy Storchaka
975fce3788 Issue #19029: Change non-existing since 3.0 StringType to str. 2013-09-16 11:01:31 +03:00
Ethan Furman
c850f34220 Close #18693: Enum is now more help() friendly. 2013-09-15 16:59:35 -07:00
Andrew Kuchling
173a157e72 #1565525: Add traceback.clear_frames() helper function to clear locals ref'd by a traceback 2013-09-15 18:15:56 -04:00
Ethan Furman
101e0746d3 Close #18989: enum members will no longer overwrite other attributes, nor be overwritten by them. 2013-09-15 12:34:36 -07:00
Senthil Kumaran
defe7f4c62 Expose --bind argument for http.server, enable http.server to bind to a user
specified network interface.

Patch contributed by Malte Swart. Addresses issue #17764.

HG :Enter commit message.  Lines beginning with 'HG:' are removed.
2013-09-15 09:37:27 -07:00
Raymond Hettinger
c76aa4832b merge 2013-09-14 20:52:54 -07:00
Raymond Hettinger
46f5ca31d0 Issue #19018: The heapq.merge() function no longer suppresses IndexError 2013-09-14 20:51:57 -07:00
Ethan Furman
668dede7e9 Close #18929: inspect.classify_class_attrs will now search the metaclasses (last) to find where an attr was defined. 2013-09-14 18:53:26 -07:00
Ethan Furman
2131a4a2fc Add __reversed__ to Enum. Minor code reorg (moved __members__ to be in alpha order). 2013-09-14 18:11:24 -07:00
Ezio Melotti
5589bd109a #18856: merge with 3.3. 2013-09-15 04:05:04 +03:00
Ezio Melotti
0a32d92bff Merge heads. 2013-09-15 03:00:42 +03:00
Antoine Pitrou
04d4d6a3aa Avoid test_logging failure when run after test_unittest, by renaming a conflicting logger 2013-09-14 21:16:39 +02:00
Antoine Pitrou
0715b9fad3 Issue #18937: Add an assertLogs() context manager to unittest.TestCase to ensure that a block of code emits a message using the logging module. 2013-09-14 19:45:47 +02:00
R David Murray
692ee9eaf0 #18206: Re-fix license URL. 2013-09-14 13:31:44 -04:00
R David Murray
f11caa0bba Merge #18206: Fix test for existence of license URL.
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.
2013-09-14 13:31:14 -04:00
R David Murray
1bc6ceba92 #18206: Fix test for existence of license URL.
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.
2013-09-14 13:28:37 -04:00
Ezio Melotti
87f09371b0 #18856: improve test coverage of the calendar module. Patch by Madison May. 2013-09-14 04:55:53 +03:00
Antoine Pitrou
a19b1a664f Adjust comment 2013-09-14 00:40:46 +02:00
Antoine Pitrou
4b3c58c8a0 Issue #19013: add a __main__ to unittest.test.testmock to ease CLI invocation 2013-09-14 00:39:15 +02:00
Antoine Pitrou
e1ba8df182 Issue #19013: add a __main__ to unittest.test to ease CLI invocation 2013-09-14 00:37:18 +02:00
Antoine Pitrou
356bdeb0a1 Issue #19013: add unittest.main() epilogs to unittest.mock's own test modules 2013-09-13 23:54:01 +02:00
Antoine Pitrou
1d7c8c9a00 Issue #19013: add unittest.main() epilogs to unittest's own test modules 2013-09-13 23:52:46 +02:00
Ezio Melotti
87456e53a8 #18981: merge with 3.3. 2013-09-13 23:54:41 +03:00
Ezio Melotti
e7f4c1c045 #18981: fix a typo in a comment (noticed by Anoop Thomas Mathew). 2013-09-13 23:52:12 +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
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
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
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