From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 5 Jun 2009 19:13:27 +0000 (+0000)
Subject: Merged revisions 73250 via svnmerge from
X-Git-Tag: v3.1rc2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0d98aa5c00bf51a0ff7b82d8dad224a19969e43;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 73250 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73250 | benjamin.peterson | 2009-06-05 14:09:28 -0500 (Fri, 05 Jun 2009) | 1 line

  only test for named pipe when os.stat doesn't raise #6209
........
---

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 9ef1cf2ea61e..dc36820dc9a7 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -58,9 +58,10 @@ def copyfile(src, dst):
         except OSError:
             # File most likely does not exist
             pass
-        # XXX What about other special files? (sockets, devices...)
-        if stat.S_ISFIFO(st.st_mode):
-            raise SpecialFileError("`%s` is a named pipe" % fn)
+        else:
+            # XXX What about other special files? (sockets, devices...)
+            if stat.S_ISFIFO(st.st_mode):
+                raise SpecialFileError("`%s` is a named pipe" % fn)
     try:
         fsrc = open(src, 'rb')
         fdst = open(dst, 'wb')