From 9f89138000e538f683b7f88e8b6123de64725003 Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Wed, 25 Sep 2019 17:58:53 +0200
Subject: [PATCH] Test #1844 and #1854

---
 .travis.yml                      |  6 +-----
 gyp/pylib/gyp/xcode_emulation.py |  2 +-
 lib/find-python.js               | 10 +++++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ab77f250af..ae9081bbfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ matrix:
       os: osx
       #osx_image: xcode11
       language: shell  # 'language: python' is not yet supported on macOS
-      env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
+      env: NODE_GYP_FORCE_PYTHON=python3
       before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
     - name: "Node.js 12 & Python 3.7 on Windows"
       os: windows
@@ -58,12 +58,8 @@ matrix:
       env: >-
         PATH=/c/Python37:/c/Python37/Scripts:$PATH
         NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
-        EXPERIMENTAL_NODE_GYP_PYTHON3=1
       before_install: choco install python
 
-  allow_failures:
-    - os: osx
-      env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
 install:
   #- pip install -r requirements.txt
   - pip install flake8  # pytest  # add another testing frameworks later
diff --git a/gyp/pylib/gyp/xcode_emulation.py b/gyp/pylib/gyp/xcode_emulation.py
index faf00a82a5..f6dfab4c15 100644
--- a/gyp/pylib/gyp/xcode_emulation.py
+++ b/gyp/pylib/gyp/xcode_emulation.py
@@ -1279,7 +1279,7 @@ def XcodeVersion():
     if version:
       version = re.match(r'(\d+\.\d+\.?\d*)', version).groups()[0]
     else:
-      raise GypError("No Xcode or CLT version detected!")
+      raise GypError("No Xcode or CLT version detected! {}".format(version))
     # The CLT has no build information, so we return an empty string.
     version_list = [version, '']
   version = version_list[0]
diff --git a/lib/find-python.js b/lib/find-python.js
index 30bb25fd36..bd7cb850ee 100644
--- a/lib/find-python.js
+++ b/lib/find-python.js
@@ -18,8 +18,7 @@ PythonFinder.prototype = {
   log: logWithPrefix(log, 'find Python'),
   argsExecutable: [ '-c', 'import sys; print(sys.executable);' ],
   argsVersion: [ '-c', 'import sys; print("%s.%s.%s" % sys.version_info[:3]);' ],
-  semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
-    : '>=2.7.0 <3.0.0',
+  semverRange: '2.7.x || >=3.5.0',
 
   // These can be overridden for testing:
   execFile: cp.execFile,
@@ -93,6 +92,11 @@ PythonFinder.prototype = {
           check: this.checkCommand,
           arg: 'python'
         },
+        {
+          before: () => { this.addLog('checking if "python3" can be used') },
+          check: this.checkCommand,
+          arg: 'python3'
+        },
         {
           before: () => { this.addLog('checking if "python2" can be used') },
           check: this.checkCommand,
@@ -286,7 +290,7 @@ PythonFinder.prototype = {
     //                                                           X
     const info = [
       '**********************************************************',
-      'You need to install the latest version of Python 2.7.',
+      'You need to install the latest version of Python.',
       'Node-gyp should be able to find and use Python. If not,',
       'you can try one of the following options:',
       `- Use the switch --python="${pathExample}"`,