Commit b01142b5 authored by Tarek Ziadé's avatar Tarek Ziadé

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
........
parent 85b53533
...@@ -84,8 +84,6 @@ def copyfile(src, dst): ...@@ -84,8 +84,6 @@ def copyfile(src, dst):
if _samefile(src, dst): if _samefile(src, dst):
raise Error("`%s` and `%s` are the same file" % (src, dst)) raise Error("`%s` and `%s` are the same file" % (src, dst))
fsrc = None
fdst = None
for fn in [src, dst]: for fn in [src, dst]:
try: try:
st = os.stat(fn) st = os.stat(fn)
...@@ -96,6 +94,7 @@ def copyfile(src, dst): ...@@ -96,6 +94,7 @@ def copyfile(src, dst):
# XXX What about other special files? (sockets, devices...) # XXX What about other special files? (sockets, devices...)
if stat.S_ISFIFO(st.st_mode): if stat.S_ISFIFO(st.st_mode):
raise SpecialFileError("`%s` is a named pipe" % fn) raise SpecialFileError("`%s` is a named pipe" % fn)
with open(src, 'rb') as fsrc: with open(src, 'rb') as fsrc:
with open(dst, 'wb') as fdst: with open(dst, 'wb') as fdst:
copyfileobj(fsrc, fdst) copyfileobj(fsrc, fdst)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment