From 92e97ecc214908f422c76e27a0a253a5147f82f7 Mon Sep 17 00:00:00 2001
From: Oz N Tiram <oz.tiram@gmail.com>
Date: Mon, 25 Jul 2022 20:40:35 +0200
Subject: [PATCH] Remove patch to safety/__main__.py to handle pyyaml

This is really not needed anymore.
k# Your branch is up to date with 'origin/vendoring-improvements'.
---
 pipenv/patched/safety/__main__.py             | 45 +--------------
 .../patches/patched/safety-main.patch         | 57 -------------------
 2 files changed, 1 insertion(+), 101 deletions(-)
 delete mode 100644 tasks/vendoring/patches/patched/safety-main.patch

diff --git a/pipenv/patched/safety/__main__.py b/pipenv/patched/safety/__main__.py
index 90e702a7..d9a0bdab 100644
--- a/pipenv/patched/safety/__main__.py
+++ b/pipenv/patched/safety/__main__.py
@@ -1,51 +1,8 @@
 """Allow safety to be executable through `python -m safety`."""
 from __future__ import absolute_import
 
-import os
-import sys
-import sysconfig
-
-
-PATCHED_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-PIPENV_DIR = os.path.dirname(PATCHED_DIR)
-VENDORED_DIR = os.path.join("PIPENV_DIR", "vendor")
-
-
-def get_site_packages():
-    prefixes = {sys.prefix, sysconfig.get_config_var('prefix')}
-    try:
-        prefixes.add(sys.real_prefix)
-    except AttributeError:
-        pass
-    form = sysconfig.get_path('purelib', expand=False)
-    py_version_short = '{0[0]}.{0[1]}'.format(sys.version_info)
-    return {
-        form.format(base=prefix, py_version_short=py_version_short)
-        for prefix in prefixes
-    }
-
-
-def insert_before_site_packages(*paths):
-    site_packages = get_site_packages()
-    index = None
-    for i, path in enumerate(sys.path):
-        if path in site_packages:
-            index = i
-            break
-    if index is None:
-        sys.path += list(paths)
-    else:
-        sys.path = sys.path[:index] + list(paths) + sys.path[index:]
-
-
-def insert_pipenv_dirs():
-    insert_before_site_packages(os.path.dirname(PIPENV_DIR), PATCHED_DIR, VENDORED_DIR)
+from .cli import cli
 
 
 if __name__ == "__main__":  # pragma: no cover
-    insert_pipenv_dirs()
-    yaml_lib = "pipenv.patched.yaml{0}".format(sys.version_info[0])
-    locals()[yaml_lib] = __import__(yaml_lib)
-    sys.modules["yaml"] = sys.modules[yaml_lib]
-    from pipenv.patched.safety.cli import cli
     cli(prog_name="safety")
diff --git a/tasks/vendoring/patches/patched/safety-main.patch b/tasks/vendoring/patches/patched/safety-main.patch
deleted file mode 100644
index 3d214863..00000000
--- a/tasks/vendoring/patches/patched/safety-main.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/pipenv/patched/safety/__main__.py b/pipenv/patched/safety/__main__.py
-index d9a0bdab..f905408a 100644
---- a/pipenv/patched/safety/__main__.py
-+++ b/pipenv/patched/safety/__main__.py
-@@ -1,8 +1,51 @@
- """Allow safety to be executable through `python -m safety`."""
- from __future__ import absolute_import
- 
--from .cli import cli
-+import os
-+import sys
-+import sysconfig
-+
-+
-+PATCHED_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-+PIPENV_DIR = os.path.dirname(PATCHED_DIR)
-+VENDORED_DIR = os.path.join("PIPENV_DIR", "vendor")
-+
-+
-+def get_site_packages():
-+    prefixes = {sys.prefix, sysconfig.get_config_var('prefix')}
-+    try:
-+        prefixes.add(sys.real_prefix)
-+    except AttributeError:
-+        pass
-+    form = sysconfig.get_path('purelib', expand=False)
-+    py_version_short = '{0[0]}.{0[1]}'.format(sys.version_info)
-+    return {
-+        form.format(base=prefix, py_version_short=py_version_short)
-+        for prefix in prefixes
-+    }
-+
-+
-+def insert_before_site_packages(*paths):
-+    site_packages = get_site_packages()
-+    index = None
-+    for i, path in enumerate(sys.path):
-+        if path in site_packages:
-+            index = i
-+            break
-+    if index is None:
-+        sys.path += list(paths)
-+    else:
-+        sys.path = sys.path[:index] + list(paths) + sys.path[index:]
-+
-+
-+def insert_pipenv_dirs():
-+    insert_before_site_packages(os.path.dirname(PIPENV_DIR), PATCHED_DIR, VENDORED_DIR)
- 
- 
- if __name__ == "__main__":  # pragma: no cover
-+    insert_pipenv_dirs()
-+    yaml_lib = "pipenv.patched.yaml{0}".format(sys.version_info[0])
-+    locals()[yaml_lib] = __import__(yaml_lib)
-+    sys.modules["yaml"] = sys.modules[yaml_lib]
-+    from safety.cli import cli
-     cli(prog_name="safety")