From 69bf2d3d6683f4fbc5f4bda192145ca385c3827f Mon Sep 17 00:00:00 2001
From: gutsytechster <prashantsharma161198@gmail.com>
Date: Sat, 21 Mar 2020 22:39:48 +0530
Subject: [PATCH] fix(freeze.py): Skip current directory through freeze and not
 vendor

---
 src/pip/_internal/commands/freeze.py                |  9 ++++++++-
 src/pip/_vendor/pkg_resources/__init__.py           |  2 --
 .../vendoring/patches/pkg_resources.patch           | 13 -------------
 3 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 tools/automation/vendoring/patches/pkg_resources.patch

diff --git a/src/pip/_internal/commands/freeze.py b/src/pip/_internal/commands/freeze.py
index 4758e30343f..8a89de4f3a5 100644
--- a/src/pip/_internal/commands/freeze.py
+++ b/src/pip/_internal/commands/freeze.py
@@ -3,6 +3,7 @@
 
 from __future__ import absolute_import
 
+import os
 import sys
 
 from pip._internal.cache import WheelCache
@@ -83,12 +84,18 @@ def run(self, options, args):
 
         cmdoptions.check_list_path_option(options)
 
+        paths = options.path
+        # Filter sys.path, to avoid listing distributions from
+        # current directory
+        if paths is None:
+            paths = [item for item in sys.path if item and item != os.getcwd()]
+
         freeze_kwargs = dict(
             requirement=options.requirements,
             find_links=options.find_links,
             local_only=options.local,
             user_only=options.user,
-            paths=options.path,
+            paths=paths,
             skip_regex=options.skip_requirements_regex,
             isolated=options.isolated_mode,
             wheel_cache=wheel_cache,
diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py
index 31331a31988..a457ff27ef0 100644
--- a/src/pip/_vendor/pkg_resources/__init__.py
+++ b/src/pip/_vendor/pkg_resources/__init__.py
@@ -562,8 +562,6 @@ def __init__(self, entries=None):
 
         if entries is None:
             entries = sys.path
-            if '' in entries:
-                entries.remove('')
 
         for entry in entries:
             self.add_entry(entry)
diff --git a/tools/automation/vendoring/patches/pkg_resources.patch b/tools/automation/vendoring/patches/pkg_resources.patch
deleted file mode 100644
index 703919a7461..00000000000
--- a/tools/automation/vendoring/patches/pkg_resources.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py
-index a457ff27..31331a31 100644
---- a/src/pip/_vendor/pkg_resources/__init__.py
-+++ b/src/pip/_vendor/pkg_resources/__init__.py
-@@ -562,6 +562,8 @@ class WorkingSet:
-
-         if entries is None:
-             entries = sys.path
-+            if '' in entries:
-+                entries.remove('')
-
-         for entry in entries:
-             self.add_entry(entry)