Commit graph

21937 commits

Author SHA1 Message Date
Nick Coghlan
324c9faeb1 Merge from 3.3 2012-10-19 23:37:28 +10:00
Nick Coghlan
11d752e374 Remove unused import 2012-10-19 23:37:16 +10:00
Nick Coghlan
d4f5ad6c6e Merge fix from #6074 from 3.3 2012-10-19 23:36:15 +10:00
Nick Coghlan
eb8d627bbd Issue #6074: Apply an appropriate fix for importlib based imports 2012-10-19 23:32:00 +10:00
Giampaolo Rodola'
b0cc91290c Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager. 2012-10-19 13:34:32 +02:00
Giampaolo Rodola'
89e92854b6 Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager. 2012-10-19 13:25:17 +02:00
Ned Deily
5d590d8705 Issue #16226: Fix IDLE Path Browser crash.
(Patch by Roger Serwy)
2012-10-18 18:19:11 -07:00
Ned Deily
bfbf3f139d Issue #16226: Fix IDLE Path Browser crash.
(Patch by Roger Serwy)
2012-10-18 18:16:44 -07:00
Trent Nelson
c78649873f Merge issue #15298. 2012-10-17 18:05:27 -04:00
Trent Nelson
ecbe2a9185 Issue #15298: refactor previous fix from 66959d419369. 2012-10-17 18:03:24 -04:00
Giampaolo Rodola'
284529dcf4 test_logging.py: where needed use unittest's assertGreater, assertLesser, assertIs rather than assertTrue (also in order to debug issue 16264) 2012-10-17 13:24:27 +02:00
Trent Nelson
b4e4c92592 Issue #16257: make test_create_connection() handle ENETUNREACH. 2012-10-17 06:16:02 -04:00
Trent Nelson
016884cbaa Issue #16257: make test_create_connection() handle ENETUNREACH. 2012-10-17 06:15:40 -04:00
Trent Nelson
45bb613e25 Issue #16257: make test_create_connection() handle ENETUNREACH. 2012-10-17 06:15:15 -04:00
Trent Nelson
b21099a4ca Merge issue #15298: fix an OS X bootstrap issue with _sysconfigdata.py. 2012-10-17 04:24:44 -04:00
Trent Nelson
ee528cccde Issue #15298: fix an OS X bootstrap issue with _sysconfigdata.py.
Reported by: Ned Deily.
2012-10-17 04:23:50 -04:00
Eric Snow
42da889fec merge for issue #16160: Subclass support now works for types.SimpleNamespace. 2012-10-16 22:45:49 -07:00
Eric Snow
547298c94c Close #16160: Subclass support now works for types.SimpleNamespace. Thanks to RDM for noticing. 2012-10-16 22:35:38 -07:00
Antoine Pitrou
8261f838ff Merge for issue #15744: add tests for the writelines() method of file objects. 2012-10-16 23:06:17 +02:00
Antoine Pitrou
0c7081aff4 Merge for issue #15744: add tests for the writelines() method of file objects. 2012-10-16 23:05:01 +02:00
Antoine Pitrou
3ed2cb5520 Also add tests for TextIOWrapper.writelines() (issue #15744). 2012-10-16 23:02:27 +02:00
Antoine Pitrou
131a489903 Add tests for the writelines() method of file objects.
Original patch by Felipe Cruz.
2012-10-16 22:57:11 +02:00
Antoine Pitrou
cfc22b4a9b Issue #15958: bytes.join and bytearray.join now accept arbitrary buffer objects. 2012-10-16 21:07:23 +02:00
Trent Nelson
b16269e375 Merge issue #15298: ensure _sysconfigdata is generated in build directory,
not source directory.

Patch by: Richard Oudkerk (sbt).
2012-10-16 08:17:11 -04:00
Trent Nelson
c101bf32c4 Issue #15298: ensure _sysconfigdata is generated in build directory,
not source directory.

Patch by Richard Oudkerk (sbt).
2012-10-16 08:13:12 -04:00
Trent Nelson
744faddae8 Merge issue #15833: don't raise an exception if importlib can't write
byte-compiled files.

This fixes a regression introduced by 3.3.

Patch by Charles-François Natali.
2012-10-16 08:03:21 -04:00
Trent Nelson
d783c8ed00 Issue #15833: don't raise an exception if importlib can't write byte-compiled
files.

This fixes a regression introduced by 3.3.  Patch by Charles-François Natali.
2012-10-16 07:47:34 -04:00
Vinay Sajip
3ba726ce04 Closes #16244: Merged change from 3.3. 2012-10-16 10:33:30 +01:00
Vinay Sajip
e7e7af4558 Issue #16244: Merged change from 3.2. 2012-10-16 10:32:13 +01:00
Vinay Sajip
ee892b9226 Issue #16244: Remove file mode overrides. 2012-10-16 10:28:31 +01:00
Giampaolo Rodola'
35eeb30adf logging's SocketHandler: get rid of some legacy code and use the newer socket.create_connection() utility function 2012-10-15 16:57:37 +02:00
Nadeem Vawda
6d70870812 Clean up some warnings in test suite output. 2012-10-14 01:42:32 +02:00
Benjamin Peterson
174baa39f6 merge heads 2012-10-13 11:58:23 -04:00
Benjamin Peterson
d541d3fee4 When not optimized function stack sizes are much larger and may cause this test to fail. 2012-10-13 11:46:44 -04:00
Nadeem Vawda
801985e4b7 lzma module: Rewrap docstrings at 72 columns, as per PEP 8. 2012-10-13 04:26:49 +02:00
Benjamin Peterson
143d034ecd merge 3.2 2012-10-12 12:04:32 -04:00
Benjamin Peterson
7a9953edfb skip if __doc__ is gone 2012-10-12 11:44:19 -04:00
Benjamin Peterson
a5c4090394 skip if __doc__ is gone 2012-10-12 11:44:19 -04:00
Benjamin Peterson
951a9e381b fix to work if __doc__ is removed 2012-10-12 11:44:10 -04:00
Benjamin Peterson
fa5f75a7ce fix to work if __doc__ is removed 2012-10-12 11:44:10 -04:00
Brett Cannon
6072e0bf42 Remove uses of % with str.format. 2012-10-12 10:00:34 -04:00
Brian Curtin
e33f20c4e9 Merge 3.2 2012-10-11 16:12:47 -05:00
Brian Curtin
0b960f5a58 Fix #16176. Properly identify Windows 8 via platform.platform()
Add handling of the 6.2 release line, aka Windows 8 and Windows 2012 Server.
2012-10-11 16:07:52 -05:00
Vinay Sajip
bd40d3e144 Closes #15776: pyvenv now works with existing directories. 2012-10-11 17:22:45 +01:00
Senthil Kumaran
24dfdb69ca code smell. remove pdb 2012-10-11 00:11:26 -07:00
Senthil Kumaran
52d2720499 Issue #16088: BaseHTTPRequestHandler's send_error method includes a
Content-Length header.  Patch by Antoine Pitrou.
2012-10-10 23:16:21 -07:00
Jesus Cea
5ea197aef3 Closes #16135: Removal of OS/2 support (distutils) (II) 2012-10-11 01:56:01 +02:00
Jesus Cea
d17833d360 Closes #16135: Removal of OS/2 support (distutils) 2012-10-11 01:20:12 +02:00
Brett Cannon
9407d50208 Merge fix for issue #15111. 2012-10-10 19:18:37 -04:00
Brett Cannon
a6ce4fd426 Closes issue #15111: Calling __import__ with a module specified in
fromlist which causes its own ImportError (e.g. the module tries to
import a non-existent module) should have that exception propagate.
2012-10-10 19:03:46 -04:00