summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
Diffstat (limited to 'django/core')
-rw-r--r--django/core/files/storage.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/django/core/files/storage.py b/django/core/files/storage.py
index b0168186ef..9929e20981 100644
--- a/django/core/files/storage.py
+++ b/django/core/files/storage.py
@@ -309,11 +309,11 @@ class FileSystemStorage(Storage):
def listdir(self, path):
path = self.path(path)
directories, files = [], []
- for entry in os.listdir(path):
- if os.path.isdir(os.path.join(path, entry)):
- directories.append(entry)
+ for entry in os.scandir(path):
+ if entry.is_dir():
+ directories.append(entry.name)
else:
- files.append(entry)
+ files.append(entry.name)
return directories, files
def path(self, name):