[Python-checkins] python/dist/src/Lib shutil.py,1.32,1.33

Thu Oct 7 23:10:13 CEST 2004

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31268
Modified Files:
	shutil.py 
Log Message:
Rewrite rmtree using os.walk to fix bug #1025127:
The shutils.rmtree() implementation uses an excessive amount of memory when
deleting large directory hierarchies. Before actually deleting any files, it
builds up a list of (function, filename) tuples for all the files that it is
going to remove.
Index: shutil.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/shutil.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33

--- shutil.py	14 Aug 2004 14:51:01 -0000	1.32
+++ shutil.py	7 Oct 2004 21:10:08 -0000	1.33
@@ -127,6 +127,9 @@
 if errors:
 raise Error, errors
 
+def _raise_err(err):
+ raise err
+
 def rmtree(path, ignore_errors=False, onerror=None):
 """Recursively delete a directory tree.
 
@@ -134,12 +137,20 @@
 onerror is set, it is called to handle the error; otherwise, an
 exception is raised.
 """
- cmdtuples = []
+ # This strange way of calling functions is necessary to keep the onerror
+ # argument working. Maybe sys._getframe hackery would work as well, but
+ # this is simple.
+ func = os.listdir
 arg = path
 try:
- func = os.listdir # Make sure it isn't unset
- _build_cmdtuple(path, cmdtuples)
- for func, arg in cmdtuples:
+ for (dirpath, dirnames, filenames) in os.walk(path, topdown=False,
+ onerror=_raise_err):
+ for filename in filenames:
+ func = os.remove
+ arg = os.path.join(dirpath, filename)
+ func(arg)
+ func = os.rmdir
+ arg = dirpath
 func(arg)
 except OSError:
 exc = sys.exc_info()
@@ -150,17 +161,6 @@
 else:
 raise exc[0], (exc[1][0], exc[1][1] + ' removing '+arg)
 
-# Helper for rmtree()
-def _build_cmdtuple(path, cmdtuples):
- for f in os.listdir(path):
- real_f = os.path.join(path,f)
- if os.path.isdir(real_f) and not os.path.islink(real_f):
- _build_cmdtuple(real_f, cmdtuples)
- else:
- cmdtuples.append((os.remove, real_f))
- cmdtuples.append((os.rmdir, path))
-
-
 def move(src, dst):
 """Recursively move a file or directory to another location.
 
