[Python-checkins] r80841 - in python/branches/release31-maint: Lib/shutil.py

[tarek.ziade]

Author: tarek.ziade
Date: Thu May  6 00:44:06 2010
New Revision: 80841

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

................
  r80840 | tarek.ziade | 2010-05-06 00:43:04 +0200 (Thu, 06 May 2010) | 9 lines
  
  Merged revisions 80837 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r80837 | tarek.ziade | 2010-05-06 00:41:25 +0200 (Thu, 06 May 2010) | 1 line
    
    removed non needed lines
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/shutil.py

Modified: python/branches/release31-maint/Lib/shutil.py
==============================================================================
--- python/branches/release31-maint/Lib/shutil.py	(original)
+++ python/branches/release31-maint/Lib/shutil.py	Thu May  6 00:44:06 2010
@@ -51,8 +51,6 @@
     if _samefile(src, dst):
         raise Error("`%s` and `%s` are the same file" % (src, dst))
 
-    fsrc = None
-    fdst = None
     for fn in [src, dst]:
         try:
             st = os.stat(fn)