Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
57,474 Commits 6 Branches 592 Tags 2.4 GiB
Commit Graph

57474 Commits

Author SHA1 Message Date
Ezio Melotti d5050b3e17 Merge indentation fixes with 3.3. 2012-10-21 03:22:53 +03:00
Ezio Melotti b24d3cf769 Fix indentation (or Sphinx will think these are attributes of ConnectionError). 2012-10-21 03:22:05 +03:00
Antoine Pitrou 6f7b0da6bc Issue #12805: Make bytes.join and bytearray.join faster when the separator is empty. 
Patch by Serhiy Storchaka.
 2012-10-20 23:08:34 +02:00
Ned Deily 257c1323f7 Issue #10405: merge from 3.3 2012-10-20 13:28:16 -07: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 13b1547e1b Merge punctuation fixes with 3.3. 2012-10-20 22:54:12 +03:00
Ezio Melotti 76e7ea5b4c Fix punctuation. 2012-10-20 22:53:47 +03:00
Ezio Melotti 022b6d2fa5 Merge "seealso" change with 3.3. 2012-10-20 16:27:51 +03:00
Ezio Melotti 36e01df18e Move note about the implementation in the "seealso". 2012-10-20 16:26:18 +03:00
Mark Dickinson 5ee2404d1e Fix concurrent.futures docstring typo: "Request Q" -> "Result Q". 2012-10-20 13:16:49 +01:00
Nick Coghlan aaa28832fd Merge from 3.3 2012-10-20 20:13:42 +10: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 fe54fd51d2 Propagate dummy merge from 3.3 2012-10-20 11:45:23 +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 8d3069a221 Merge wrong escape removal with 3.3. 2012-10-19 20:40:57 +03:00
Ezio Melotti 5b69fbd4c9 Remove wrong escape in code snippet. 2012-10-19 20:40:18 +03:00
Nick Coghlan 359fc8e835 Propagate dummy merge from 3.3 2012-10-20 00:04:36 +10: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 f3cf34cfbd Propagate dummy merge from 3.3 2012-10-19 23:40:58 +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 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
Nick Coghlan 0772398a9a Propagate dummy merge from 3.3 2012-10-19 23:01:45 +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
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
Georg Brandl edbe30c7c7 Merge with 3.3 2012-10-19 07:37:56 +02:00
Georg Brandl 2ee776bcea Fix merging mistake. 2012-10-19 07:37:44 +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
Mark Dickinson e453e4c007 Issue 16280: Drop questionable special-casing of null pointer in PyLong_FromVoidPtr. 2012-10-18 22:18:42 +01:00
Antoine Pitrou 74375fc06a Followup to issue #15958: add join.h to Makefile dependencies for byte strings 
(thanks Serhiy).
 2012-10-18 21:31:22 +02:00
Mark Dickinson 5cb65917e1 Issue #16277: merge fix from 3.3 2012-10-18 19:53:45 +01: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 56d279fe35 Merge from 3.3: clarify universal-newline wording in tutorial (issue #16266). 
This also null merges from a previous commit.
 2012-10-17 20:29:07 -07: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 f17512f67e Merge heads. 2012-10-17 18:08:40 -04:00
Trent Nelson dd35500073 Merge heads. 2012-10-17 18:08:16 -04: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