Rename Python vendor dir to python_modules

Author: dom96

src/pyodide/internal/python.ts

@@ -65,7 +65,7 @@ function setupPythonSearchPath(pyodide: Pyodide): void {
       import sys
       from pathlib import Path
 
-      VENDOR_PATH = "/session/metadata/vendor"
+      VENDOR_PATH = "/session/metadata/python_modules"
 
       # adjustSysPath adds the session path, but it is immortalised by the memory snapshot. This
       # code runs irrespective of the memory snapshot.

src/workerd/api/pyodide/pyodide-test.c++

@@ -359,8 +359,8 @@ KJ_TEST("Filters out so") {
 }
 
 KJ_TEST("Filters out vendor stuff") {
-  auto workerModules =
-      strArray("vendor/a.py", "vendor/package/b.py", "vendor/c.so", "vendor/x.txt");
+  auto workerModules = strArray("python_modules/a.py", "python_modules/package/b.py",
+      "python_modules/c.so", "python_modules/x.txt");
   auto imports = strArray("a", "package", "x");
   auto result = filterPythonScriptImports(kj::mv(workerModules), kj::mv(imports), "");
   KJ_REQUIRE(result.size() == 1);

src/workerd/api/pyodide/pyodide.c++

@@ -98,7 +98,7 @@ kj::Array<kj::String> PythonModuleInfo::getPythonFileContents() {
 
 kj::HashSet<kj::String> PythonModuleInfo::getWorkerModuleSet() {
   auto result = kj::HashSet<kj::String>();
-  const auto vendor = "vendor/"_kj;
+  const auto vendor = "python_modules/"_kj;
   const auto dotPy = ".py"_kj;
   const auto dotSo = ".so"_kj;
   for (auto& item: names) {
@@ -418,26 +418,26 @@ kj::Own<PyodideMetadataReader::State> PyodideMetadataReader::State::clone() {
 }
 
 void PyodideMetadataReader::State::verifyNoMainModuleInVendor() {
-  // Verify that we don't have module named after the main module in the `vendor` subdir.
+  // Verify that we don't have module named after the main module in the `python_modules` subdir.
   // mainModule includes the .py extension, so we need to extract the base name
   kj::ArrayPtr<const char> mainModuleBase = mainModule;
   if (mainModule.endsWith(".py")) {
     mainModuleBase = mainModuleBase.slice(0, mainModuleBase.size() - 3);
   }
 
   for (auto& name: moduleInfo.names) {
-    if (name.startsWith(kj::str("vendor/", mainModule))) {
+    if (name.startsWith(kj::str("python_modules/", mainModule))) {
       JSG_FAIL_REQUIRE(
-          Error, kj::str("Python module vendor/", mainModule, " clashes with main module"));
+          Error, kj::str("Python module python_modules/", mainModule, " clashes with main module"));
     }
-    if (name == kj::str("vendor/", mainModuleBase, "/__init__.py")) {
+    if (name == kj::str("python_modules/", mainModuleBase, "/__init__.py")) {
       JSG_FAIL_REQUIRE(Error,
-          kj::str(
-              "Python module vendor/", mainModuleBase, "/__init__.py clashes with main module"));
+          kj::str("Python module python_modules/", mainModuleBase,
+              "/__init__.py clashes with main module"));
     }
-    if (name == kj::str("vendor/", mainModuleBase, ".so")) {
-      JSG_FAIL_REQUIRE(
-          Error, kj::str("Python module vendor/", mainModuleBase, ".so clashes with main module"));
+    if (name == kj::str("python_modules/", mainModuleBase, ".so")) {
+      JSG_FAIL_REQUIRE(Error,
+          kj::str("Python module python_modules/", mainModuleBase, ".so clashes with main module"));
     }
   }
 }

src/workerd/server/tests/python/vendor_dir/vendor_dir.wd-test

@@ -7,10 +7,10 @@ const unitTests :Workerd.Config = (
         modules = [
           (name = "worker.py", pythonModule = embed "worker.py"),
           (name = "duplicate.py", pythonModule = embed "vendor/a.py"),
-          (name = "vendor/a.py", pythonModule = embed "vendor/a.py"),
+          (name = "python_modules/a.py", pythonModule = embed "vendor/a.py"),
           # This module below is only here to verify that we don't crash because of
           # duplicate module names.
-          (name = "vendor/duplicate.py", pythonModule = embed "vendor/a.py"),
+          (name = "python_modules/duplicate.py", pythonModule = embed "vendor/a.py"),
           # This module below exercises a bug which caused our internal introspection.py
           # module to import it instead of the SDK module. See EW-9317 for more info.
           (name = "workers.py", pythonModule = embed "vendor/a.py"),

src/workerd/server/tests/python/vendor_dir/worker.py

@@ -10,10 +10,10 @@ def test():
 
 def test_path_ordering():
     """Verify that the Python path is set in the correct order.
-    '/session/metadata/vendor' should be positioned after the system paths
+    '/session/metadata/python_modules' should be positioned after the system paths
     but before any site-packages paths.
     """
-    vendor_path = "/session/metadata/vendor"
+    vendor_path = "/session/metadata/python_modules"
     vendor_index = sys.path.index(vendor_path)
 
     # Check that vendor_path is in sys.path