Skip to content

Commit 9ffa80f

Browse files
miss-islingtontotosukipicnixz
authored
[3.13] gh-127541: Update os.walk example (GH-127765) (GH-131869)
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 1059b0c commit 9ffa80f

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
@@ -3621,16 +3621,16 @@ features:
36213621

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

36263626
import os
36273627
from os.path import join, getsize
3628-
for root, dirs, files in os.walk('python/Lib/email'):
3628+
for root, dirs, files in os.walk('python/Lib/xml'):
36293629
print(root, "consumes", end=" ")
36303630
print(sum(getsize(join(root, name)) for name in files), end=" ")
36313631
print("bytes in", len(files), "non-directory files")
3632-
if 'CVS' in dirs:
3633-
dirs.remove('CVS') # don't visit CVS directories
3632+
if '__pycache__' in dirs:
3633+
dirs.remove('__pycache__') # don't visit __pycache__ directories
36343634

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

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

36883688
import os
3689-
for root, dirs, files, rootfd in os.fwalk('python/Lib/email'):
3689+
for root, dirs, files, rootfd in os.fwalk('python/Lib/xml'):
36903690
print(root, "consumes", end="")
36913691
print(sum([os.stat(name, dir_fd=rootfd).st_size for name in files]),
36923692
end="")
36933693
print("bytes in", len(files), "non-directory files")
3694-
if 'CVS' in dirs:
3695-
dirs.remove('CVS') # don't visit CVS directories
3694+
if '__pycache__' in dirs:
3695+
dirs.remove('__pycache__') # don't visit __pycache__ directories
36963696

36973697
In the next example, walking the tree bottom-up is essential:
36983698
: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
@@ -337,12 +337,12 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
337337
338338
import os
339339
from os.path import join, getsize
340-
for root, dirs, files in os.walk('python/Lib/email'):
340+
for root, dirs, files in os.walk('python/Lib/xml'):
341341
print(root, "consumes ")
342342
print(sum(getsize(join(root, name)) for name in files), end=" ")
343343
print("bytes in", len(files), "non-directory files")
344-
if 'CVS' in dirs:
345-
dirs.remove('CVS') # don't visit CVS directories
344+
if '__pycache__' in dirs:
345+
dirs.remove('__pycache__') # don't visit __pycache__ directories
346346
347347
"""
348348
sys.audit("os.walk", top, topdown, onerror, followlinks)
@@ -468,13 +468,13 @@ def fwalk(top=".", topdown=True, onerror=None, *, follow_symlinks=False, dir_fd=
468468
Example:
469469
470470
import os
471-
for root, dirs, files, rootfd in os.fwalk('python/Lib/email'):
471+
for root, dirs, files, rootfd in os.fwalk('python/Lib/xml'):
472472
print(root, "consumes", end="")
473473
print(sum(os.stat(name, dir_fd=rootfd).st_size for name in files),
474474
end="")
475475
print("bytes in", len(files), "non-directory files")
476-
if 'CVS' in dirs:
477-
dirs.remove('CVS') # don't visit CVS directories
476+
if '__pycache__' in dirs:
477+
dirs.remove('__pycache__') # don't visit __pycache__ directories
478478
"""
479479
sys.audit("os.fwalk", top, topdown, onerror, follow_symlinks, dir_fd)
480480
top = fspath(top)

0 commit comments

Comments
 (0)