disable-search-modules-on-filesystem.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. commit 6d00415ed919717959a3b801d1c71fb83b6bece8
  2. merge: 018629609ef9f3ae6ca5b2a2b0070fba40016b32 4883f0360b567e068fcca67261df7e13ce6a4a2c
  3. author: orivej
  4. date: 2019-07-22T03:09:30+03:00
  5. revision: 5328556
  6. Do not let Python 3 search modules on filesystem by default. DEVTOOLS-4574
  7. REVIEW: 885661
  8. Note: mandatory check (NEED_CHECK) was skipped
  9. --- contrib/tools/python3/Lib/site.py (018629609ef9f3ae6ca5b2a2b0070fba40016b32)
  10. +++ contrib/tools/python3/Lib/site.py (6d00415ed919717959a3b801d1c71fb83b6bece8)
  11. @@ -590,17 +590,17 @@ def main():
  12. global ENABLE_USER_SITE
  13. orig_path = sys.path[:]
  14. - known_paths = removeduppaths()
  15. + #known_paths = removeduppaths()
  16. if orig_path != sys.path:
  17. # removeduppaths() might make sys.path absolute.
  18. # fix __file__ and __cached__ of already imported modules too.
  19. abs_paths()
  20. - known_paths = venv(known_paths)
  21. + #known_paths = venv(known_paths)
  22. if ENABLE_USER_SITE is None:
  23. ENABLE_USER_SITE = check_enableusersite()
  24. - known_paths = addusersitepackages(known_paths)
  25. - known_paths = addsitepackages(known_paths)
  26. + #known_paths = addusersitepackages(known_paths)
  27. + #known_paths = addsitepackages(known_paths)
  28. setquit()
  29. setcopyright()
  30. sethelper()
  31. --- contrib/tools/python3/Python/sysmodule.c (018629609ef9f3ae6ca5b2a2b0070fba40016b32)
  32. +++ contrib/tools/python3/Python/sysmodule.c (6d00415ed919717959a3b801d1c71fb83b6bece8)
  33. @@ -3307,1 +3307,1 @@ PySys_SetArgvEx(int argc, wchar_t **argv, int updatepath)
  34. - PySys_SetArgvEx(argc, argv, Py_IsolatedFlag == 0);
  35. + PySys_SetArgvEx(argc, argv, 0);