From: Guido van Rossum <guido@python.org>
Date: Wed, 14 Jul 2004 00:49:20 +0000 (+0000)
Subject: Backport:
X-Git-Tag: v2.3.5c1~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a580c4c64f1e5726063bf7bb4ec2d1eb48d8f33;p=thirdparty%2FPython%2Fcpython.git

Backport:

- Bug #981530: Fix UnboundLocalError in shutil.rmtree().  This affects
  the documented behavior: the function passed to the onerror()
  handler can now also be os.listdir.

[I could've sworn I checked this in, but apparently I didn't, or it
got lost???]
---

diff --git a/Doc/lib/libshutil.tex b/Doc/lib/libshutil.tex
index 17b1daa9c2cc..16f18e14ce90 100644
--- a/Doc/lib/libshutil.tex
+++ b/Doc/lib/libshutil.tex
@@ -88,7 +88,7 @@ rather than printing a message]{2.3}
   If \var{onerror} is provided, it must be a callable that accepts
   three parameters: \var{function}, \var{path}, and \var{excinfo}.
   The first parameter, \var{function}, is the function which raised
-  the exception; it will be \function{os.remove()} or
+  the exception; it will be \function{os.listdir()}, \function{os.remove()} or
   \function{os.rmdir()}.  The second parameter, \var{path}, will be
   the path name passed to \var{function}.  The third parameter,
   \var{excinfo}, will be the exception information return by