[Python-checkins] r80840 - in python/branches/py3k: Lib/shutil.py

[tarek.ziade]

Author: tarek.ziade
Date: Thu May  6 00:43:04 2010
New Revision: 80840

Log:
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/py3k/   (props changed)
   python/branches/py3k/Lib/shutil.py

Modified: python/branches/py3k/Lib/shutil.py
==============================================================================
--- python/branches/py3k/Lib/shutil.py	(original)
+++ python/branches/py3k/Lib/shutil.py	Thu May  6 00:43:04 2010
@@ -84,8 +84,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)
@@ -96,6 +94,7 @@
             # XXX What about other special files? (sockets, devices...)
             if stat.S_ISFIFO(st.st_mode):
                 raise SpecialFileError("`%s` is a named pipe" % fn)
+
     with open(src, 'rb') as fsrc:
         with open(dst, 'wb') as fdst:
             copyfileobj(fsrc, fdst)