R David Murray
b7c1a5dcad
Merge merge heads.
2013-09-18 07:36:12 -04:00
R David Murray
4fedddef57
Merge heads.
2013-09-18 07:35:30 -04:00
R David Murray
825b50a40f
Merge heads.
2013-09-18 07:34:13 -04:00
doko@ubuntu.com
9937155a1c
- followup for issue #18997 , make _clear_joined_ptr static.
2013-09-18 12:13:18 +02:00
doko@ubuntu.com
0648bf795c
- followup for issue #18997 , make _clear_joined_ptr static.
2013-09-18 12:12:28 +02:00
R David Murray
4750fa8369
Merge #14984 : On POSIX, enforce permissions when reading default .netrc.
2013-09-17 21:28:17 -04:00
R David Murray
fb9dc0b3ae
Merge #14984 : On POSIX, enforce permissions when reading default .netrc.
2013-09-17 21:04:50 -04:00
R David Murray
8270a2c209
Merge #14984 : On POSIX, enforce permissions when reading default .netrc.
2013-09-17 20:32:54 -04:00
R David Murray
104aab956f
#14984 : On POSIX, enforce permissions when reading default .netrc.
...
Initial patch by Bruno Piguet.
This is implemented as if a useful .netrc file could exist without passwords,
which is possible in the general case; but in fact our netrc implementation
does not support it. Fixing that issue will be an enhancement.
2013-09-17 20:30:02 -04:00
Serhiy Storchaka
935349406a
Issue #18873 : The tokenize module, IDLE, 2to3, and the findnocoding.py script
...
now detect Python source code encoding only in comment lines.
2013-09-16 23:57:00 +03:00
Serhiy Storchaka
dafea85190
Issue #18873 : The tokenize module, IDLE, 2to3, and the findnocoding.py script
...
now detect Python source code encoding only in comment lines.
2013-09-16 23:51:56 +03:00
Serhiy Storchaka
3c41154331
Issue #17003 : Unified the size argument names in the io module with common
...
practice.
2013-09-16 23:18:10 +03:00
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
Georg Brandl
c6ebbef6bd
One more markup fix.
2013-09-16 04:03:12 +02: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
Raymond Hettinger
8408dc581e
Issue 18771: Make it possible to set the number linear probes at compile-time.
2013-09-15 14:57:15 -07:00
Tim Peters
e6d35dba3c
Null merge of 3.3 into default.
2013-09-15 15:40:18 -05:00
Tim Peters
a238914952
Null merge of 3.2 into 3.3.
2013-09-15 15:39:06 -05:00
Tim Peters
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
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
Georg Brandl
5642ff9d8e
Fixup reST syntax errors and streamline docs of PEP 446.
2013-09-15 10:37:57 +02: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
Antoine Pitrou
7c89ae206e
Address Terry's comments
2013-09-15 02:01:39 +02: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
Georg Brandl
c79413df5e
merge with 3.3
2013-09-14 09:11:21 +02:00
Georg Brandl
0a9d05155c
merge with 3.2
2013-09-14 09:11:09 +02:00
Georg Brandl
bc75046bb3
Add a NEWS entry for b9b521efeba3.
2013-09-14 09:10:21 +02:00
Georg Brandl
c5884d8930
Add NEWS entry for c18c18774e24.
2013-09-14 09:09:18 +02:00
Georg Brandl
c17a8dfaca
Fix tkinter regression introduced by the security fix in #16248 .
2013-09-14 09:08:09 +02:00
Georg Brandl
db4309e19a
Fix tkinter regression introduced by the security fix in #16248 .
2013-09-14 09:08:09 +02: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
Brett Cannon
a87e31ca52
Issue #18955 : clarify what is removed by importlib.util.module_for_loader.
2013-09-13 16:52:19 -04:00