Remove cwd while running using isolate script (#14014)

karthiknadig · web-flow · commit 8c0d3aa2eb60 · 2020-09-21T20:37:54.000-07:00
* Remove cwd while running using isolate script

* Run inplace.

* Fix formatting
diff --git a/news/2 Fixes/13942.md b/news/2 Fixes/13942.md
@@ -0,0 +1 @@
+Fix isolate script to only remove current working directory.
diff --git a/pythonFiles/pyvsc-run-isolated.py b/pythonFiles/pyvsc-run-isolated.py
@@ -4,14 +4,20 @@
 if __name__ != "__main__":
     raise Exception("{} cannot be imported".format(__name__))
 
+import os
 import os.path
 import runpy
 import sys
 
-# We "isolate" the script/module (sys.argv[1]) by
-# replacing sys.path[0] with a dummy path and then sending the target
-# on to runpy.
-sys.path[0] = os.path.join(os.path.dirname(__file__), ".does-not-exist")
+
+def normalize(path):
+    return os.path.normcase(os.path.normpath(path))
+
+
+# We "isolate" the script/module (sys.argv[1]) by removing current working
+# directory or '' in sys.path and then sending the target on to runpy.
+cwd = normalize(os.getcwd())
+sys.path[:] = (p for p in sys.path if p != "" and normalize(p) != cwd)
 del sys.argv[0]
 module = sys.argv[0]
 if module == "-c":

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix isolate script to only remove current working directory.`