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 17b1daa9c2cc3897a80f4b0a6dd0ae89ab69f848..16f18e14ce902d37554a7c4c9ffbb2441436328f 100644 (file)
--- 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