[Python-checkins] r83497 - python/branches/release26-maint

[georg.brandl]

Author: georg.brandl
Date: Mon Aug  2 00:19:52 2010
New Revision: 83497

Log:
Blocked revisions 82588,82802-82803,82875 via svnmerge

................
  r82588 | georg.brandl | 2010-07-05 19:50:55 +0200 (Mo, 05 Jul 2010) | 9 lines
  
  Merged revisions 82587 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/branches/py3k
  
  ........
    r82587 | georg.brandl | 2010-07-05 19:48:38 +0200 (Mo, 05 Jul 2010) | 1 line
    
    #9166: NotImplemented is not an exception.
  ........
................
  r82802 | georg.brandl | 2010-07-11 11:34:16 +0200 (So, 11 Jul 2010) | 9 lines
  
  Merged revisions 82799 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/branches/py3k
  
  ........
    r82799 | georg.brandl | 2010-07-11 11:26:57 +0200 (So, 11 Jul 2010) | 1 line
    
    Fix typo.
  ........
................
  r82803 | georg.brandl | 2010-07-11 11:36:31 +0200 (So, 11 Jul 2010) | 8 lines
  
  Blocked revisions 82801 via svnmerge
  
  ........
    r82801 | georg.brandl | 2010-07-11 11:33:39 +0200 (So, 11 Jul 2010) | 1 line
    
    #9184: fix default value for "buffering" param of open().
  ........
................
  r82875 | georg.brandl | 2010-07-14 10:55:03 +0200 (Mi, 14 Jul 2010) | 8 lines
  
  Blocked revisions 82873 via svnmerge
  
  ........
    r82873 | georg.brandl | 2010-07-14 10:53:36 +0200 (Mi, 14 Jul 2010) | 1 line
    
    Remove unused code that would raise a NameError.
  ........
................


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