Do not process system Python 2 on macOS Monterey

news/2 Fixes/17870.md

@@ -0,0 +1 @@
+Do not process system Python 2 installs on macOS Monterey.

src/client/pythonEnvironments/base/locators/lowLevel/macDefaultLocator.ts

@@ -12,5 +12,8 @@ export function isMacDefaultPythonPath(pythonPath: string): boolean {
     if (getOSType() !== OSType.OSX) {
         return false;
     }
-    return pythonPath === 'python' || pythonPath === '/usr/bin/python';
+
+    const defaultPaths = ['python', '/usr/bin/python'];
+
+    return defaultPaths.includes(pythonPath) || pythonPath.startsWith('/usr/bin/python2');
 }

src/client/pythonEnvironments/base/locators/lowLevel/posixKnownPathsLocator.ts

@@ -1,22 +1,40 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import * as os from 'os';
+import { gte } from 'semver';
 import { traceError } from '../../../../common/logger';
 import { PythonEnvKind, PythonEnvSource } from '../../info';
 import { BasicEnvInfo, IPythonEnvsIterator, Locator } from '../../locator';
 import { commonPosixBinPaths, getPythonBinFromPosixPaths } from '../../../common/posixUtils';
 import { isPyenvShimDir } from '../../../common/environmentManagers/pyenv';
+import { getOSType, OSType } from '../../../../common/utils/platform';
+import { isMacDefaultPythonPath } from './macDefaultLocator';
 
 export class PosixKnownPathsLocator extends Locator<BasicEnvInfo> {
     private kind: PythonEnvKind = PythonEnvKind.OtherGlobal;
 
     public iterEnvs(): IPythonEnvsIterator<BasicEnvInfo> {
+        // Flag to remove system installs of Python 2 from the list of discovered interpreters
+        // If on macOS Monterey or later.
+        // See https://github.com/microsoft/vscode-python/issues/17870.
+        let isMacPython2Deprecated = false;
+        if (getOSType() === OSType.OSX && gte(os.release(), '21.0.0')) {
+            isMacPython2Deprecated = true;
+        }
+
         const iterator = async function* (kind: PythonEnvKind) {
             // Filter out pyenv shims. They are not actual python binaries, they are used to launch
             // the binaries specified in .python-version file in the cwd. We should not be reporting
             // those binaries as environments.
             const knownDirs = (await commonPosixBinPaths()).filter((dirname) => !isPyenvShimDir(dirname));
-            const pythonBinaries = await getPythonBinFromPosixPaths(knownDirs);
+            let pythonBinaries = await getPythonBinFromPosixPaths(knownDirs);
+
+            // Filter out MacOS system installs of Python 2 if necessary.
+            if (isMacPython2Deprecated) {
+                pythonBinaries = pythonBinaries.filter((binary) => !isMacDefaultPythonPath(binary));
+            }
+
             for (const bin of pythonBinaries) {
                 try {
                     yield { executablePath: bin, kind, source: [PythonEnvSource.PathEnvVar] };

src/test/pythonEnvironments/base/locators/lowLevel/macDefaultLocator.unit.test.ts

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as assert from 'assert';
+import * as sinon from 'sinon';
+import * as osUtils from '../../../../../client/common/utils/platform';
+import { isMacDefaultPythonPath } from '../../../../../client/pythonEnvironments/base/locators/lowLevel/macDefaultLocator';
+
+suite('isMacDefaultPythonPath', () => {
+    let getOSTypeStub: sinon.SinonStub;
+
+    setup(() => {
+        getOSTypeStub = sinon.stub(osUtils, 'getOSType');
+    });
+
+    teardown(() => {
+        sinon.restore();
+    });
+
+    const testCases: { path: string; os: osUtils.OSType; expected: boolean }[] = [
+        { path: 'python', os: osUtils.OSType.OSX, expected: true },
+        { path: 'python', os: osUtils.OSType.Windows, expected: false },
+        { path: '/usr/bin/python', os: osUtils.OSType.OSX, expected: true },
+        { path: '/usr/bin/python', os: osUtils.OSType.Linux, expected: false },
+        { path: '/usr/bin/python2', os: osUtils.OSType.OSX, expected: true },
+        { path: '/usr/local/bin/python2', os: osUtils.OSType.OSX, expected: false },
+        { path: '/usr/bin/python3', os: osUtils.OSType.OSX, expected: false },
+        { path: '/usr/bin/python3', os: osUtils.OSType.Linux, expected: false },
+    ];
+
+    testCases.forEach(({ path, os, expected }) => {
+        const testName = `If the Python path is ${path} on ${os}, it is${
+            expected ? '' : ' not'
+        } a macOS default Python path`;
+
+        test(testName, () => {
+            getOSTypeStub.returns(os);
+
+            const result = isMacDefaultPythonPath(path);
+
+            assert.strictEqual(result, expected);
+        });
+    });
+});

src/test/pythonEnvironments/base/locators/lowLevel/posixKnownPathsLocator.unit.test.ts

@@ -1,16 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import * as assert from 'assert';
 import * as path from 'path';
 import * as sinon from 'sinon';
+import * as semver from 'semver';
 import * as executablesAPI from '../../../../../client/common/utils/exec';
+import * as osUtils from '../../../../../client/common/utils/platform';
 import { PythonEnvKind, PythonEnvSource } from '../../../../../client/pythonEnvironments/base/info';
 import { BasicEnvInfo } from '../../../../../client/pythonEnvironments/base/locator';
 import { getEnvs } from '../../../../../client/pythonEnvironments/base/locatorUtils';
 import { PosixKnownPathsLocator } from '../../../../../client/pythonEnvironments/base/locators/lowLevel/posixKnownPathsLocator';
 import { createBasicEnv } from '../../common';
 import { TEST_LAYOUT_ROOT } from '../../../common/commonTestConstants';
 import { assertBasicEnvsEqual } from '../envTestUtils';
+import { isMacDefaultPythonPath } from '../../../../../client/pythonEnvironments/base/locators/lowLevel/macDefaultLocator';
 
 suite('Posix Known Path Locator', () => {
     let getPathEnvVar: sinon.SinonStub;
@@ -33,7 +37,7 @@ suite('Posix Known Path Locator', () => {
         locator = new PosixKnownPathsLocator();
     });
     teardown(() => {
-        getPathEnvVar.restore();
+        sinon.restore();
     });
 
     test('iterEnvs(): get python bin from known test roots', async () => {
@@ -56,4 +60,40 @@ suite('Posix Known Path Locator', () => {
         const actualEnvs = (await getEnvs(locator.iterEnvs())).filter((e) => e.executablePath.indexOf('posixroot') > 0);
         assertBasicEnvsEqual(actualEnvs, expectedEnvs);
     });
+
+    test('iterEnvs(): Do not return Python 2 installs when on macOS Monterey', async function () {
+        if (osUtils.getOSType() !== osUtils.OSType.OSX) {
+            this.skip();
+        }
+
+        const getOSTypeStub = sinon.stub(osUtils, 'getOSType');
+        const gteStub = sinon.stub(semver, 'gte');
+
+        getOSTypeStub.returns(osUtils.OSType.OSX);
+        gteStub.returns(true);
+
+        const actualEnvs = await getEnvs(locator.iterEnvs());
+
+        const globalPython2Envs = actualEnvs.filter((env) => isMacDefaultPythonPath(env.executablePath));
+
+        assert.strictEqual(globalPython2Envs.length, 0);
+    });
+
+    test('iterEnvs(): Return Python 2 installs when not on macOS Monterey', async function () {
+        if (osUtils.getOSType() !== osUtils.OSType.OSX) {
+            this.skip();
+        }
+
+        const getOSTypeStub = sinon.stub(osUtils, 'getOSType');
+        const gteStub = sinon.stub(semver, 'gte');
+
+        getOSTypeStub.returns(osUtils.OSType.OSX);
+        gteStub.returns(false);
+
+        const actualEnvs = await getEnvs(locator.iterEnvs());
+
+        const globalPython2Envs = actualEnvs.filter((env) => isMacDefaultPythonPath(env.executablePath));
+
+        assert.notStrictEqual(globalPython2Envs.length, 0);
+    });
 });