Browse Source

handle invalid dir better

David Rose 17 years ago
parent
commit
d315cbf20e
1 changed files with 7 additions and 5 deletions
  1. 7 5
      direct/src/stdpy/file.py

+ 7 - 5
direct/src/stdpy/file.py

@@ -261,11 +261,13 @@ def walk(top, topdown = True, onerror = None, followlinks = True):
     dirnames = []
     dirnames = []
     filenames = []
     filenames = []
 
 
-    for file in _vfs.scanDirectory(top):
-        if file.isDirectory():
-            dirnames.append(file.getFilename().getBasename())
-        else:
-            filenames.append(file.getFilename().getBasename())
+    dirlist = _vfs.scanDirectory(top)
+    if dirlist:
+        for file in dirlist:
+            if file.isDirectory():
+                dirnames.append(file.getFilename().getBasename())
+            else:
+                filenames.append(file.getFilename().getBasename())
 
 
     if topdown:
     if topdown:
         yield (top, dirnames, filenames)
         yield (top, dirnames, filenames)