[Python-checkins] r78686 - in python/branches/release31-maint: Lib/lib2to3/tests/test_fixers.py Lib/lib2to3/tests/test_main.py Lib/lib2to3/tests/test_pytree.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Mar  5 04:30:16 2010
New Revision: 78686

Log:
Merged revisions 78684 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78684 | benjamin.peterson | 2010-03-04 21:27:12 -0600 (Thu, 04 Mar 2010) | 20 lines
  
  Merged revisions 78683 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ................
    r78683 | benjamin.peterson | 2010-03-04 21:24:17 -0600 (Thu, 04 Mar 2010) | 13 lines
    
    Merged revisions 78679,78681 via svnmerge from 
    svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
    
    ........
      r78679 | benjamin.peterson | 2010-03-04 21:10:46 -0600 (Thu, 04 Mar 2010) | 1 line
      
      set svn:eol-style
    ........
      r78681 | benjamin.peterson | 2010-03-04 21:19:06 -0600 (Thu, 04 Mar 2010) | 1 line
      
      remove svn:executable property
    ........
  ................
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/lib2to3/tests/test_fixers.py   (props changed)
   python/branches/release31-maint/Lib/lib2to3/tests/test_main.py   (props changed)
   python/branches/release31-maint/Lib/lib2to3/tests/test_pytree.py   (props changed)