From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 20 Aug 2004 06:35:46 +0000 (+0000)
Subject: Replace tricky and/or with straight-forward if:else:
X-Git-Tag: v2.4a3~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61d77e0d970fb816efa1d0bc758c4b461da99e8c;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index ba5a1d21f6fe..ff9f51f2651f 100644
--- 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