From b01142b5dc69611a5e37789e2b81995ad89b2cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= Date: Wed, 5 May 2010 22:43:04 +0000 Subject: [PATCH] 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 ........ --- Lib/shutil.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Lib/shutil.py b/Lib/shutil.py index 74a4db87351..44c8ac37a20 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -84,8 +84,6 @@ def copyfile(src, dst): 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 @@ def copyfile(src, dst): # 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)