[Python-checkins] python/dist/src/Lib shutil.py, 1.28.10.1, 1.28.10.2

[gvanrossum at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv412

Modified Files:
      Tag: release23-maint
	shutil.py 
Log Message:
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???]


Index: shutil.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/shutil.py,v
retrieving revision 1.28.10.1
retrieving revision 1.28.10.2
diff -C2 -d -r1.28.10.1 -r1.28.10.2
*** shutil.py	19 Jun 2004 21:39:22 -0000	1.28.10.1
--- shutil.py	14 Jul 2004 00:46:26 -0000	1.28.10.2
***************
*** 129,132 ****
--- 129,133 ----
      arg = path
      try:
+         func = os.listdir # Make sure it isn't unset
          _build_cmdtuple(path, cmdtuples)
          for func, arg in cmdtuples: