D12282: setup: always decode xcode version

Submitter	phabricator
Date	March 2, 2022, 3:46 p.m.
Message ID	<differential-rev-PHID-DREV-zbaizwc4x6mhkiju7cea-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/50620/
State	New
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Wed, 2 Mar 2022 15:46:06 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "durin42 (Augie Fackler)" <phabricator@mercurial-scm.org> Subject: D12282: setup: always decode xcode version Message-ID: <differential-rev-PHID-DREV-zbaizwc4x6mhkiju7cea-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-zbaizwc4x6mhkiju7cea Thread-Index: NDRhNjNmZGI1ZTFlNzhlZDNmMTRjYzhjMWU1 MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "durin42 \(Augie Fackler\)" <phabricator+D12282+public+3f03cf4e7abe2020@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - March 2, 2022, 3:46 p.m.

durin42 created this revision.
durin42 added a reviewer: indygreg.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Not decoding was a Python 2 thing.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12282

AFFECTED FILES
  setup.py

CHANGE DETAILS




To: durin42, indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1663,9 +1663,7 @@ 
 if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
     version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[1].splitlines()
     if version:
-        version = version[0]
-        if sys.version_info[0] == 3:
-            version = version.decode('utf-8')
+        version = version[0].decode('utf-8')
         xcode4 = version.startswith('Xcode') and StrictVersion(
             version.split()[1]
         ) >= StrictVersion('4.0')

Patchwork D12282: setup: always decode xcode version

Comments

Patch