e6d35dba3c
Null merge of 3.3 into default.
2013-09-15 15:40:18 -05:00
a238914952
Null merge of 3.2 into 3.3.
2013-09-15 15:39:06 -05:00
945a251e4a
Null merge of 3.1 into 3.2
...
Changeset c39f42f46a05 left a dangling head on 3.1.
2013-09-15 15:37:25 -05:00
101e0746d3
Close #18989 : enum members will no longer overwrite other attributes, nor be overwritten by them.
2013-09-15 12:34:36 -07:00
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
5642ff9d8e
Fixup reST syntax errors and streamline docs of PEP 446.
2013-09-15 10:37:57 +02:00
c76aa4832b
merge
2013-09-14 20:52:54 -07:00
46f5ca31d0
Issue #19018 : The heapq.merge() function no longer suppresses IndexError
2013-09-14 20:51:57 -07:00
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
2131a4a2fc
Add __reversed__ to Enum. Minor code reorg (moved __members__ to be in alpha order).
2013-09-14 18:11:24 -07:00
5589bd109a
#18856 : merge with 3.3.
2013-09-15 04:05:04 +03:00
7c89ae206e
Address Terry's comments
2013-09-15 02:01:39 +02:00
0a32d92bff
Merge heads.
2013-09-15 03:00:42 +03:00
04d4d6a3aa
Avoid test_logging failure when run after test_unittest, by renaming a conflicting logger
2013-09-14 21:16:39 +02:00
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
692ee9eaf0
#18206 : Re-fix license URL.
2013-09-14 13:31:44 -04:00
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
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
c79413df5e
merge with 3.3
2013-09-14 09:11:21 +02:00
0a9d05155c
merge with 3.2
2013-09-14 09:11:09 +02:00
bc75046bb3
Add a NEWS entry for b9b521efeba3.
2013-09-14 09:10:21 +02:00
c5884d8930
Add NEWS entry for c18c18774e24.
2013-09-14 09:09:18 +02:00
c17a8dfaca
Fix tkinter regression introduced by the security fix in #16248 .
2013-09-14 09:08:09 +02:00
db4309e19a
Fix tkinter regression introduced by the security fix in #16248 .
2013-09-14 09:08:09 +02:00
87f09371b0
#18856 : improve test coverage of the calendar module. Patch by Madison May.
2013-09-14 04:55:53 +03:00
a19b1a664f
Adjust comment
2013-09-14 00:40:46 +02:00
4b3c58c8a0
Issue #19013 : add a __main__ to unittest.test.testmock to ease CLI invocation
2013-09-14 00:39:15 +02:00
e1ba8df182
Issue #19013 : add a __main__ to unittest.test to ease CLI invocation
2013-09-14 00:37:18 +02:00
356bdeb0a1
Issue #19013 : add unittest.main() epilogs to unittest.mock's own test modules
2013-09-13 23:54:01 +02:00
1d7c8c9a00
Issue #19013 : add unittest.main() epilogs to unittest's own test modules
2013-09-13 23:52:46 +02:00
87456e53a8
#18981 : merge with 3.3.
2013-09-13 23:54:41 +03:00
a87e31ca52
Issue #18955 : clarify what is removed by importlib.util.module_for_loader.
2013-09-13 16:52:19 -04:00
e7f4c1c045
#18981 : fix a typo in a comment (noticed by Anoop Thomas Mathew).
2013-09-13 23:52:12 +03:00
92ed89081e
#18951 : merge with 3.3.
2013-09-13 22:18:02 +03:00
560a77881b
#18951 : use consistent names in unittest docs.
2013-09-13 22:17:40 +03:00
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
12f18289c0
Merge for Issue #18997 : Issue #18997 : fix ElementTree crash with using pickle and __getstate__.
2013-09-13 06:27:52 -07:00
61f4cd1dd5
Add Germán M. Bravo to Misc/ACKS
2013-09-13 06:24:59 -07:00
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
7290608af7
Issue #18945 : Add tests for tempfile name collision handling.
...
Patch by Vlad Shcherbina
2013-09-13 05:30:00 -07:00
aa04f9ae7d
Issue #18945 : Add tests for tempfile name collision handling.
...
Patch by Vlad Shcherbina
2013-09-13 05:28:20 -07:00
bf28d2dcad
Issue #18818 : The "encodingname" part of PYTHONIOENCODING is now optional.
2013-09-13 11:46:24 +03:00
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
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
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
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
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
d184f664e3
Automated merge with file:///Users/skumaran/python/cpython
2013-09-11 22:56:30 -07:00
b5651edaf1
Automated merge with ssh://hg.python.org/cpython
2013-09-11 22:56:28 -07:00
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
Tim Peters
Ethan Furman
Senthil Kumaran
Georg Brandl
Raymond Hettinger
Ezio Melotti
Antoine Pitrou
R David Murray
Brett Cannon
Charles-François Natali
Eli Bendersky
Serhiy Storchaka