Skip to content

Commit 7313e11

Browse files
committed
Remove trailing whitespace
1 parent 55e1773 commit 7313e11

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

Lib/shutil.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,14 +1071,14 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0,
10711071
in the zip file. The zip file is created at the same level in the
10721072
directory structure as `base_dir`.
10731073
1074-
Symbolic links to files and directories are followed and the
1075-
targets of the links included in the zip file. This matches the
1074+
Symbolic links to files and directories are followed and the
1075+
targets of the links included in the zip file. This matches the
10761076
default behaviour of command-line zip utilities on
10771077
Linux/UNIX/Windows systems.
10781078
1079-
Hard links to files are followed and the targets of the links
1080-
included in the zip file. There is no de-duplication of multiple
1081-
hard links to the same file that is provided by other formats,
1079+
Hard links to files are followed and the targets of the links
1080+
included in the zip file. There is no de-duplication of multiple
1081+
hard links to the same file that is provided by other formats,
10821082
e.g. tar.
10831083
10841084
CAUTION: This function uses os.walk() to prepare the list of files to be

Lib/test/test_shutil.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,7 +1637,7 @@ def _create_files(self, base_dir='dist'):
16371637
return root_dir, base_dir
16381638

16391639
def _create_files_symlinks(self, base_dir="symlinks"):
1640-
# Create a test structure containing symbolic links to files and
1640+
# Create a test structure containing symbolic links to files and
16411641
# directories.
16421642
root_dir = self.mkdtemp()
16431643
wd = os.path.join(root_dir, base_dir)
@@ -1916,8 +1916,8 @@ def test_zipfile_vs_zip(self):
19161916
@os_helper.skip_unless_symlink
19171917
def test_make_zipfile_symlink_behaviour(self):
19181918
# Test that symbolic links for both file and directories are resolved
1919-
# to their targets when shutil.make_archive() is used to make a zip
1920-
# file, to match default command-line zip behaviour in
1919+
# to their targets when shutil.make_archive() is used to make a zip
1920+
# file, to match default command-line zip behaviour in
19211921
# Linux/UNIX/Windows.
19221922

19231923
# If this test is being skipped, it is because either the operating
@@ -1937,14 +1937,14 @@ def test_make_zipfile_symlink_behaviour(self):
19371937
extract_dir = os.path.join(root_dir, base_dir, 'extract')
19381938
zf.extractall(extract_dir)
19391939
try:
1940-
# If symbolic link sub2 that targets directory sub1 was
1940+
# If symbolic link sub2 that targets directory sub1 was
19411941
# preserved as a link then sub2/file2 will not exist.
19421942
self.assertTrue(
19431943
os.path.exists(
19441944
os.path.join(extract_dir, base_dir, 'sub2/file2')
19451945
)
19461946
)
1947-
# If symbolic link link1 that targets file1 was preserved then
1947+
# If symbolic link link1 that targets file1 was preserved then
19481948
# it will be a symbolic link.
19491949
self.assertFalse(
19501950
os.path.islink(

0 commit comments

Comments
 (0)