Browse Source

os.rmdir() isn't reliable on windows

David Rose 16 years ago
parent
commit
108b2af944
1 changed files with 2 additions and 5 deletions
  1. 2 5
      direct/src/p3d/AppRunner.py

+ 2 - 5
direct/src/p3d/AppRunner.py

@@ -610,12 +610,9 @@ class AppRunner(DirectObject):
         files on Windows.  It receives a Filename, the root directory
         files on Windows.  It receives a Filename, the root directory
         to delete. """
         to delete. """
         if filename.isDirectory():
         if filename.isDirectory():
-            for child in os.listdir(filename.toOsSpecific()):
+            for child in filename.scanDirectory():
                 self.rmtree(Filename(filename, child))
                 self.rmtree(Filename(filename, child))
-            try:
-                os.chmod(filename.toOsSpecific(), 777)
-                os.rmdir(filename.toOsSpecific())
-            except OSError:
+            if not filename.rmdir():
                 print "could not remove directory %s" % (filename)
                 print "could not remove directory %s" % (filename)
         else:
         else:
             if not filename.unlink():
             if not filename.unlink():