From: Mark Hammond Date: Tue, 21 Aug 2007 01:04:47 +0000 (+0000) Subject: [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows X-Git-Tag: v2.6a1~1473 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4f271f38d0e23e408624b3fab6298d9037a1307;p=python [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows As discussed on distutils-sig: Allows the generated installer name on 64bit Windows platforms to be different than the name generated for 32bit Windows platforms. --- diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index cfcc6a951e..8979634e4b 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -29,8 +29,27 @@ def get_platform (): irix-5.3 irix64-6.2 - For non-POSIX platforms, currently just returns 'sys.platform'. + Windows will return one of: + win-x86_64 (64bit Windows on x86_64 (AMD64)) + win-ia64 (64bit Windows on Itanium) + win32 (all others - specifically, sys.platform is returned) + + For other non-POSIX platforms, currently just returns 'sys.platform'. """ + if os.name == 'nt': + # sniff sys.version for architecture. + prefix = " bit (" + i = string.find(sys.version, prefix) + if i == -1: + return sys.platform + j = string.find(sys.version, ")", i) + look = sys.version[i+len(prefix):j].lower() + if look=='amd64': + return 'win-x86_64' + if look=='itanium': + return 'win-ia64' + return sys.platform + if os.name != "posix" or not hasattr(os, 'uname'): # XXX what about the architecture? NT is Intel or Alpha, # Mac OS is M68k or PPC, etc.