Skip to content

Commit 3cd04d4

Browse files
miss-islingtontotosukipicnixz
authored
[3.12] gh-127541: Update os.walk example (GH-127765) (#131873)
gh-127541: Update os.walk example (GH-127765) Update os.walk example to be more modern, skip `__pycache__` dirs rather than `CVS` dirs. (cherry picked from commit a594998) Co-authored-by: Totosuki <[email protected]> Co-authored-by: Bénédikt Tran <[email protected]>
1 parent dfb6372 commit 3cd04d4

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Doc/library/os.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3547,16 +3547,16 @@ features:
35473547

35483548
This example displays the number of bytes taken by non-directory files in each
35493549
directory under the starting directory, except that it doesn't look under any
3550-
CVS subdirectory::
3550+
``__pycache__`` subdirectory::
35513551

35523552
import os
35533553
from os.path import join, getsize
3554-
for root, dirs, files in os.walk('python/Lib/email'):
3554+
for root, dirs, files in os.walk('python/Lib/xml'):
35553555
print(root, "consumes", end=" ")
35563556
print(sum(getsize(join(root, name)) for name in files), end=" ")
35573557
print("bytes in", len(files), "non-directory files")
3558-
if 'CVS' in dirs:
3559-
dirs.remove('CVS') # don't visit CVS directories
3558+
if '__pycache__' in dirs:
3559+
dirs.remove('__pycache__') # don't visit __pycache__ directories
35603560

35613561
In the next example (simple implementation of :func:`shutil.rmtree`),
35623562
walking the tree bottom-up is essential, :func:`rmdir` doesn't allow
@@ -3609,16 +3609,16 @@ features:
36093609

36103610
This example displays the number of bytes taken by non-directory files in each
36113611
directory under the starting directory, except that it doesn't look under any
3612-
CVS subdirectory::
3612+
``__pycache__`` subdirectory::
36133613

36143614
import os
3615-
for root, dirs, files, rootfd in os.fwalk('python/Lib/email'):
3615+
for root, dirs, files, rootfd in os.fwalk('python/Lib/xml'):
36163616
print(root, "consumes", end="")
36173617
print(sum([os.stat(name, dir_fd=rootfd).st_size for name in files]),
36183618
end="")
36193619
print("bytes in", len(files), "non-directory files")
3620-
if 'CVS' in dirs:
3621-
dirs.remove('CVS') # don't visit CVS directories
3620+
if '__pycache__' in dirs:
3621+
dirs.remove('__pycache__') # don't visit __pycache__ directories
36223622

36233623
In the next example, walking the tree bottom-up is essential:
36243624
:func:`rmdir` doesn't allow deleting a directory before the directory is

Lib/os.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,12 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
335335
336336
import os
337337
from os.path import join, getsize
338-
for root, dirs, files in os.walk('python/Lib/email'):
338+
for root, dirs, files in os.walk('python/Lib/xml'):
339339
print(root, "consumes ")
340340
print(sum(getsize(join(root, name)) for name in files), end=" ")
341341
print("bytes in", len(files), "non-directory files")
342-
if 'CVS' in dirs:
343-
dirs.remove('CVS') # don't visit CVS directories
342+
if '__pycache__' in dirs:
343+
dirs.remove('__pycache__') # don't visit __pycache__ directories
344344
345345
"""
346346
sys.audit("os.walk", top, topdown, onerror, followlinks)
@@ -466,13 +466,13 @@ def fwalk(top=".", topdown=True, onerror=None, *, follow_symlinks=False, dir_fd=
466466
Example:
467467
468468
import os
469-
for root, dirs, files, rootfd in os.fwalk('python/Lib/email'):
469+
for root, dirs, files, rootfd in os.fwalk('python/Lib/xml'):
470470
print(root, "consumes", end="")
471471
print(sum(os.stat(name, dir_fd=rootfd).st_size for name in files),
472472
end="")
473473
print("bytes in", len(files), "non-directory files")
474-
if 'CVS' in dirs:
475-
dirs.remove('CVS') # don't visit CVS directories
474+
if '__pycache__' in dirs:
475+
dirs.remove('__pycache__') # don't visit __pycache__ directories
476476
"""
477477
sys.audit("os.fwalk", top, topdown, onerror, follow_symlinks, dir_fd)
478478
top = fspath(top)

0 commit comments

Comments
 (0)