From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 14 Dec 2018 12:14:10 +0000 (+0100)
Subject: bpo-35346: Cleanup platform.architecture() (GH-11130)
X-Git-Tag: v3.8.0a1~276
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4aa917c5feaec07a6f6db87b34185ab6180e20ee;p=thirdparty%2FPython%2Fcpython.git

bpo-35346: Cleanup platform.architecture() (GH-11130)

struct.calcsize('P') now always works.
---

diff --git a/Lib/platform.py b/Lib/platform.py
index ab0cf254bc69..0fe841c71ce6 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -651,12 +651,8 @@ def architecture(executable=sys.executable, bits='', linkage=''):
     # else is given as default.
     if not bits:
         import struct
-        try:
-            size = struct.calcsize('P')
-        except struct.error:
-            # Older installations can only query longs
-            size = struct.calcsize('l')
-        bits = str(size*8) + 'bit'
+        size = struct.calcsize('P')
+        bits = str(size * 8) + 'bit'
 
     # Get data from the 'file' system command
     if executable: