57180 Commits

Author SHA1 Message Date
Ned Deily
b6d24d9746 Issue #15853: merge 3.2 -> 3.3 2012-10-22 15:18:46 -07:00
Ned Deily
fdf0f274e6 Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu
with certain versions of Tk 8.5.  Initial patch by Kevin Walzer.
2012-10-22 15:14:31 -07:00
Kristjan Valur Jonsson
abb0febd0a Issue #16295: Link "select" with ws2_32.lib, the winsock2 stub library. 2012-10-22 12:56:47 +00:00
Jesus Cea
80c2f4fc43 MERGE: Closes #16294: 8 space indent in tutorial 2012-10-22 13:15:45 +02:00
Jesus Cea
af38774b5f Closes #16294: 8 space indent in tutorial 2012-10-22 13:15:17 +02:00
Matthias Klose
aee3c76acf - Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. 2012-10-21 23:12:35 +02:00
Matthias Klose
c4c4842d86 - Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. 2012-10-21 23:05:35 +02:00
Nadeem Vawda
18b7fcc7a6 Merge #14398: Fix size truncation and overflow bugs in bz2 module. 2012-10-21 21:16:58 +02:00
Nadeem Vawda
5f8f0d6777 Issue #14398: Fix size truncation and overflow bugs in bz2 module. 2012-10-21 21:13:27 +02:00
Antoine Pitrou
550841253f Issue #16220: wsgiref now always calls close() on an iterable response.
Patch by Brent Tubbs.
2012-10-21 14:14:34 +02:00
Antoine Pitrou
66510fedb4 Fix whacky spacking in test_wsgiref 2012-10-21 14:13:32 +02:00
Antoine Pitrou
ae247a5ff6 Issue #16220: wsgiref now always calls close() on an iterable response.
Patch by Brent Tubbs.
2012-10-21 14:09:05 +02:00
Ezio Melotti
8cd45bd48d Fix PEP name. 2012-10-21 07:36:58 +03:00
Ezio Melotti
1f67e80564 Fix typo. 2012-10-21 07:24:13 +03:00
Ezio Melotti
b24d3cf769 Fix indentation (or Sphinx will think these are attributes of ConnectionError). 2012-10-21 03:22:05 +03:00
Ned Deily
d2cc1bb057 Issue #10405: merge from 3.2 2012-10-20 13:27:32 -07:00
Ned Deily
2778d0d147 Issue #10405: Document IDLE context menus in Standard Library document
and IDLE Help file.  (Thanks to Nick ODell and Todd Rovito for suggestions.)
Update Debug menu options in docs to match current code plus various other
minor IDLE doc and help edits.
2012-10-20 13:25:34 -07:00
Ezio Melotti
76e7ea5b4c Fix punctuation. 2012-10-20 22:53:47 +03:00
Ezio Melotti
36e01df18e Move note about the implementation in the "seealso". 2012-10-20 16:26:18 +03:00
Nick Coghlan
40c67739ba Fix typo in example (pointed out by a couple of people, most recently Ken Rimey) 2012-10-20 20:13:21 +10:00
Nick Coghlan
903c3167cf Dummy merge from 3.2 2012-10-20 11:45:02 +10:00
Nick Coghlan
557c76c136 Fix compilation on Windows 2012-10-20 11:43:58 +10:00
Ezio Melotti
5b69fbd4c9 Remove wrong escape in code snippet. 2012-10-19 20:40:18 +03:00
Nick Coghlan
55062e387e Dummy merge from 3.2 2012-10-20 00:04:16 +10:00
Nick Coghlan
62b4136277 Fix broken test and replace redundant generator with a tuple 2012-10-20 00:03:46 +10:00
Nick Coghlan
059e37f599 Dummy merge from 3.2 2012-10-19 23:40:21 +10:00
Nick Coghlan
c71b4c7198 Issue #6074: Actually delete the source file in the test as intended 2012-10-19 23:38:36 +10:00
Nick Coghlan
11d752e374 Remove unused import 2012-10-19 23:37:16 +10:00
Nick Coghlan
eb8d627bbd Issue #6074: Apply an appropriate fix for importlib based imports 2012-10-19 23:32:00 +10:00
Nick Coghlan
90eb8ae6ce Dummy merge from 3.2, as that approach to resolving #6074 is not applicable to importlib 2012-10-19 22:58:06 +10:00
Nick Coghlan
34937ce249 Issue #6074: Forward port Windows read-only source file fix from 2.7 2012-10-19 22:38:14 +10:00
Giampaolo Rodola'
2d51f687e1 Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager. 2012-10-19 13:40:28 +02: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
Georg Brandl
2ee776bcea Fix merging mistake. 2012-10-19 07:37:44 +02:00
Ned Deily
bfbf3f139d Issue #16226: Fix IDLE Path Browser crash.
(Patch by Roger Serwy)
2012-10-18 18:16:44 -07:00
Mark Dickinson
44362a88ad Issue #16277: merge fix from 3.2 2012-10-18 19:53:28 +01:00
Mark Dickinson
91044799f7 Issue #16277: in PyLong_FromVoidPtr, add missing branch for sizeof(void*) <= sizeof(long). 2012-10-18 19:21:43 +01:00
Chris Jerdonek
206f962f32 Merge from 3.2: clarify universal-newline wording in tutorial (issue #16266). 2012-10-17 20:21:05 -07:00
Chris Jerdonek
5bf7f1f6e3 Clarify universal-newline wording in tutorial (issue #16266). 2012-10-17 20:17:41 -07:00
Trent Nelson
dd35500073 Merge heads. 2012-10-17 18:08:16 -04:00
Trent Nelson
ecbe2a9185 Issue #15298: refactor previous fix from 66959d419369. 2012-10-17 18:03:24 -04:00
Andrew Svetlov
e60983e4a5 merge heads 2012-10-17 17:29:20 +03:00
Andrew Svetlov
72db18c4c0 null merge 2012-10-17 17:21:36 +03:00
Andrew Svetlov
0dccbe1387 null merge 2012-10-17 17:20:46 +03:00
Andrew Svetlov
2365f41a0e Merge issue #9583: Document startup option/environment interaction.
Patch by Todd Rovito.
2012-10-17 17:16:19 +03:00
Andrew Svetlov
abfc7df149 Issue #9583: Document startup option/environment interaction.
Patch by Todd Rovito.
2012-10-17 17:15:43 +03:00
Antoine Pitrou
31605ace0d Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. 2012-10-17 16:13:55 +02:00
Antoine Pitrou
1eff0fc3cd Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. 2012-10-17 16:12:30 +02:00
Andrew Svetlov
65b4b40e24 Merge issue #16265: Fix collapsing of code sample in tutorial.
Thanks to Yongzhi Pan from docs@
2012-10-17 16:46:00 +03:00
Andrew Svetlov
e9cf97cf20 Issue #16265: Fix collapsing of code sample in tutorial.
Thanks to Yongzhi Pan from docs@
2012-10-17 16:41:28 +03:00