3 files changed, 14 insertions, 19 deletions
diff --git a/Mac/BuildScript/scripts/postflight.ensurepip b/Mac/BuildScript/scripts/postflight.ensurepip
index 36d0594..bf893d1 100755
--- a/Mac/BuildScript/scripts/postflight.ensurepip
+++ b/Mac/BuildScript/scripts/postflight.ensurepip
@@ -10,20 +10,15 @@ RELFWKBIN="../../..${FWK}/bin"
 
 umask 022
 
-"${FWK}/bin/python${PYVER}" -E -s -m ensurepip --upgrade
+"${FWK}/bin/python${PYVER}" -m ensurepip --upgrade
 
-# bpo-33290: An earlier "pip3 install --upgrade pip" may have installed
-#     a "pip" in the fw bin directory.  For a py3 install, remove it.
-
-rm -f "${FWK}/bin/pip"
-
-"${FWK}/bin/python${PYVER}" -E -s -Wi \
-    "${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
+"${FWK}/bin/python${PYVER}" -Wi \
+    "${FWK}/lib/python${PYVER}/compileall.py" \
     -f -x badsyntax \
     "${FWK}/lib/python${PYVER}/site-packages"
 
-"${FWK}/bin/python${PYVER}" -E -s -Wi -O \
-    "${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
+"${FWK}/bin/python${PYVER}" -Wi -O \
+    "${FWK}/lib/python${PYVER}/compileall.py" \
     -f -x badsyntax \
     "${FWK}/lib/python${PYVER}/site-packages"
 
diff --git a/Mac/BuildScript/scripts/postflight.framework b/Mac/BuildScript/scripts/postflight.framework
index 0f2e52c..edd5038 100755
--- a/Mac/BuildScript/scripts/postflight.framework
+++ b/Mac/BuildScript/scripts/postflight.framework
@@ -6,23 +6,23 @@
 PYVER="@PYVER@"
 FWK="/Library/Frameworks/Python.framework/Versions/@PYVER@"
 
-"${FWK}/bin/python@PYVER@" -E -s -Wi \
-    "${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
+"${FWK}/bin/python@PYVER@" -Wi -tt \
+    "${FWK}/lib/python${PYVER}/compileall.py" \
     -f -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
     "${FWK}/lib/python${PYVER}"
 
-"${FWK}/bin/python@PYVER@" -E -s -Wi -O \
-    "${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
+"${FWK}/bin/python@PYVER@" -Wi -tt -O \
+    "${FWK}/lib/python${PYVER}/compileall.py" \
     -f -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
     "${FWK}/lib/python${PYVER}"
 
-"${FWK}/bin/python@PYVER@" -E -s -Wi \
-    "${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
+"${FWK}/bin/python@PYVER@" -Wi \
+    "${FWK}/lib/python${PYVER}/compileall.py" \
     -f -x badsyntax \
     "${FWK}/lib/python${PYVER}/site-packages"
 
-"${FWK}/bin/python@PYVER@" -E -s -Wi -O \
-    "${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
+"${FWK}/bin/python@PYVER@" -Wi -O \
+    "${FWK}/lib/python${PYVER}/compileall.py" \
     -f -x badsyntax \
     "${FWK}/lib/python${PYVER}/site-packages"
 
diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile
index 0a62e32..64d9169 100755
--- a/Mac/BuildScript/scripts/postflight.patch-profile
+++ b/Mac/BuildScript/scripts/postflight.patch-profile
@@ -5,7 +5,7 @@ echo "of python is not early enough of the PATH of your shell."
 echo "These changes will be effective only in shell windows that you open"
 echo "after running this script."
 
-PYVER=@PYVER@
+PYVER="@PYVER@"
 PYTHON_ROOT="/Library/Frameworks/Python.framework/Versions/@PYVER@"
 
 if [ `id -ur` = 0 ]; then