Commit 5980845b authored by Guido van Rossum's avatar Guido van Rossum

Add feature to copy(), copy2(): dst may be a directory.

Remove unneeded check for '.' / '..' from copytree().
Add some comments.
parent 277206b0
# Module 'shutil' -- utility functions usable in a shell-like program # Module 'shutil' -- utility functions usable in a shell-like program.
# XXX The copy*() functions here don't copy the data fork on Mac # XXX The copy*() functions here don't copy the data fork on Mac.
# XXX Consider this example code rather than flexible tools.
import os import os
...@@ -40,15 +41,21 @@ def copystat(src, dst): ...@@ -40,15 +41,21 @@ def copystat(src, dst):
os.chmod(dst, mode) os.chmod(dst, mode)
os.utime(dst, st[7:9]) os.utime(dst, st[7:9])
# Copy data and mode bits ("cp src dst") # Copy data and mode bits ("cp src dst").
# Support directory as target.
# #
def copy(src, dst): def copy(src, dst):
if os.path.isdir(dst):
dst = os.path.join(dst, os.path.basename(src))
copyfile(src, dst) copyfile(src, dst)
copymode(src, dst) copymode(src, dst)
# Copy data and all stat info ("cp -p src dst") # Copy data and all stat info ("cp -p src dst").
# Support directory as target.
# #
def copy2(src, dst): def copy2(src, dst):
if os.path.isdir(dst):
dst = os.path.join(dst, os.path.basename(src))
copyfile(src, dst) copyfile(src, dst)
copystat(src, dst) copystat(src, dst)
...@@ -58,22 +65,20 @@ def copy2(src, dst): ...@@ -58,22 +65,20 @@ def copy2(src, dst):
def copytree(src, dst): def copytree(src, dst):
names = os.listdir(src) names = os.listdir(src)
os.mkdir(dst, 0777) os.mkdir(dst, 0777)
dot_dotdot = (os.curdir, os.pardir)
for name in names: for name in names:
if name not in dot_dotdot: srcname = os.path.join(src, name)
srcname = os.path.join(src, name) dstname = os.path.join(dst, name)
dstname = os.path.join(dst, name) #print 'Copying', srcname, 'to', dstname
#print 'Copying', srcname, 'to', dstname try:
try: #if os.path.islink(srcname):
#if os.path.islink(srcname): # linkto = os.readlink(srcname)
# linkto = os.readlink(srcname) # os.symlink(linkto, dstname)
# os.symlink(linkto, dstname) #elif os.path.isdir(srcname):
#elif os.path.isdir(srcname): if os.path.isdir(srcname):
if os.path.isdir(srcname): copytree(srcname, dstname)
copytree(srcname, dstname) else:
else: copy2(srcname, dstname)
copy2(srcname, dstname) # XXX What about devices, sockets etc.?
# XXX What about devices, sockets etc.? except os.error, why:
except os.error, why: print 'Could not copy', srcname, 'to', dstname,
print 'Could not copy', srcname, 'to', dstname, print '(', why[1], ')'
print '(', why[1], ')'
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