Replace tricky and/or with straight-forward if:else:

2004-08-20 06:35:46 +00:00 · 2004-08-20 06:35:46 +00:00 · 61d77e0d97
parent 701abe745b
commit 61d77e0d97
1 changed files with 5 additions and 1 deletions
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@ -1137,7 +1137,11 @@ class TarFile(object):
        tarinfo.mode  = stmd
        tarinfo.uid   = statres.st_uid
        tarinfo.gid   = statres.st_gid
-        tarinfo.size  = not stat.S_ISDIR(stmd) and statres.st_size or 0
+        if stat.S_ISDIR(stmd):
+            # For a directory, the size must be 0
+            tarinfo.size  = 0
+        else:
+            tarinfo.size = statres.st_size
        tarinfo.mtime = statres.st_mtime
        tarinfo.type  = type
        tarinfo.linkname = linkname