commit 61d77e0d970fb816efa1d0bc758c4b461da99e8c
author Martin v. Löwis <martin@v.loewis.de> Fri Aug 20 06:35:46 2004 +0000
committer Martin v. Löwis <martin@v.loewis.de> Fri Aug 20 06:35:46 2004 +0000
tree 2865176e647ef66fd1ead3e4c5394b1ad5d3030b
parent 701abe745b28024662886c254a4dbc2ee1dddb3a

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

Lib/tarfile.py

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index ba5a1d2..ff9f51f 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1137,7 +1137,11 @@
         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