[Python-checkins] r83915 - in python/branches/release26-maint: Misc/NEWS

[florent.xicluna]

Author: florent.xicluna
Date: Tue Aug 10 00:15:51 2010
New Revision: 83915

Log:
Blocked revisions 83902,83907 via svnmerge

................
  r83902 | florent.xicluna | 2010-08-09 22:02:00 +0200 (lun., 09 août 2010) | 25 lines
  
  Merged revisions 83833,83838-83839,83859,83878 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/branches/py3k
  
  ........
    r83833 | florent.xicluna | 2010-08-08 18:25:27 +0200 (dim., 08 août 2010) | 2 lines
    
    Add test case for the HTTPResponse being an iterable.  Follow-up of issue #4608.
  ........
    r83838 | florent.xicluna | 2010-08-08 20:03:44 +0200 (dim., 08 août 2010) | 2 lines
    
    Typo.
  ........
    r83839 | florent.xicluna | 2010-08-08 20:06:13 +0200 (dim., 08 août 2010) | 2 lines
    
    Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.
  ........
    r83859 | florent.xicluna | 2010-08-09 00:07:16 +0200 (lun., 09 août 2010) | 2 lines
    
    Fix #8530: Prevent stringlib fastsearch from reading beyond the front of an array.
  ........
    r83878 | florent.xicluna | 2010-08-09 10:29:08 +0200 (lun., 09 août 2010) | 1 line
    
    Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest).
  ........
................
  r83907 | florent.xicluna | 2010-08-09 22:29:44 +0200 (lun., 09 août 2010) | 27 lines
  
  Missed the svnmerge property on r83902.
  
  Recorded merge of revisions 83833,83838-83839,83859,83878 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/branches/py3k
  
  ........
    r83833 | florent.xicluna | 2010-08-08 18:25:27 +0200 (dim., 08 août 2010) | 2 lines
    
    Add test case for the HTTPResponse being an iterable.  Follow-up of issue #4608.
  ........
    r83838 | florent.xicluna | 2010-08-08 20:03:44 +0200 (dim., 08 août 2010) | 2 lines
    
    Typo.
  ........
    r83839 | florent.xicluna | 2010-08-08 20:06:13 +0200 (dim., 08 août 2010) | 2 lines
    
    Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.
  ........
    r83859 | florent.xicluna | 2010-08-09 00:07:16 +0200 (lun., 09 août 2010) | 2 lines
    
    Fix #8530: Prevent stringlib fastsearch from reading beyond the front of an array.
  ........
    r83878 | florent.xicluna | 2010-08-09 10:29:08 +0200 (lun., 09 août 2010) | 1 line
    
    Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest).
  ........
................


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Tue Aug 10 00:15:51 2010
@@ -1129,7 +1129,7 @@
 - Issue #6553: Fixed a crash in cPickle.load(), when given a file-like object
   containing incomplete data.
 
-- Issue #2622: Fixed an ImportError when importing email.messsage from a
+- Issue #2622: Fixed an ImportError when importing email.message from a
   standalone application built with py2exe or py2app.
 
 - Issue #6455: Fixed test_build_ext under win32.