From e20349b13fdc61659607d6333e39b20f4e3e833f Mon Sep 17 00:00:00 2001
From: Jendrik Seipp <jendrikseipp@gmail.com>
Date: Sat, 6 Jan 2024 19:54:58 +0100
Subject: [PATCH] Revert "Read exclude patterns from .gitignore in absence of
 user-provided patterns (#344) (#345)"

This reverts commit aa6fcd281d2a6f963a99ee6f3c5055876f5a54f5.

After further thought, the --exclude flag and .gitignore file
have different responsibilities and mixing them will surprise
some users.
---
 CHANGELOG.md                     |  2 --
 README.md                        |  4 ---
 requirements.txt                 |  1 -
 tests/test_gitignore_patterns.py | 56 --------------------------------
 vulture/core.py                  | 17 +---------
 5 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 tests/test_gitignore_patterns.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8177a30..d9ec6de8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,6 @@
 * Bump flake8, flake8-comprehensions and flake8-bugbear (Sebastian Csar, #341).
 * Switch to tomllib/tomli to support heterogeneous arrays (Sebastian Csar, #340).
 * Provide whitelist parity for `MagicMock` and `Mock` (maxrake).
-* Use .gitignore to exclude files if --exclude is missing from both pyproject.toml and the command line (whosayn, #344, #345).
-* Properly detect when no .gitignore is present (travisdart, #346).
 
 # 2.10 (2023-10-06)
 
diff --git a/README.md b/README.md
index e531d8ef..99b2ec81 100644
--- a/README.md
+++ b/README.md
@@ -83,10 +83,6 @@ If you want to ignore a whole file or directory, use the `--exclude` parameter
 (e.g., `--exclude "*settings.py,*/docs/*.py,*/test_*.py,*/.venv/*.py"`). The
 exclude patterns are matched against absolute paths.
 
-Vulture 2.11+ parses the `.gitignore` file in the current working directory for
-exclude patterns if the `--exclude` parameter is unused and if there are no
-exclude patterns in the pyproject.toml file.
-
 #### Flake8 noqa comments
 
 <!-- Hide noqa docs until we decide whether we want to support it.
diff --git a/requirements.txt b/requirements.txt
index 32d83476..c0a41b86 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
-pathspec >= 0.12.1
 tomli >= 1.1.0; python_version < '3.11'
diff --git a/tests/test_gitignore_patterns.py b/tests/test_gitignore_patterns.py
deleted file mode 100644
index 0a07adef..00000000
--- a/tests/test_gitignore_patterns.py
+++ /dev/null
@@ -1,56 +0,0 @@
-import os
-import pathlib
-import pytest
-import shutil
-
-from . import call_vulture
-from vulture.utils import ExitCode
-
-
-class TempGitignore:
-    def __init__(self, patterns):
-        self.patterns = patterns
-        root = pathlib.Path(".").resolve()
-        self.file = root / ".gitignore"
-        self.tmpfile = root / ".tmp_gitignore"
-
-    def __enter__(self):
-        shutil.move(self.file, self.tmpfile)
-        with open(self.file, "w") as f:
-            f.write("\n".join(self.patterns))
-
-        return self.file
-
-    def __exit__(self, *args):
-        os.remove(self.file)
-        shutil.move(self.tmpfile, self.file)
-
-
-@pytest.fixture(scope="function")
-def gitignore(request):
-    with TempGitignore(request.param) as fpath:
-        yield fpath
-
-
-@pytest.mark.parametrize(
-    "exclude_patterns,gitignore,exit_code",
-    (
-        ([], [], ExitCode.NoDeadCode),
-        ([""], [], ExitCode.NoDeadCode),
-        ([], [""], ExitCode.NoDeadCode),
-        ([""], ["core.py", "utils.py"], ExitCode.NoDeadCode),
-        (["core.py", "utils.py"], [""], ExitCode.DeadCode),
-        ([], ["core.py", "utils.py"], ExitCode.DeadCode),
-    ),
-    indirect=("gitignore",),
-)
-def test_gitignore(exclude_patterns, gitignore, exit_code):
-    def get_csv(paths):
-        return ",".join(os.path.join("vulture", path) for path in paths)
-
-    cli_args = ["vulture/"]
-    if exclude_patterns:
-        cli_args.extend(["--exclude", get_csv(exclude_patterns)])
-
-    assert gitignore.is_file()
-    assert call_vulture(cli_args) == exit_code
diff --git a/vulture/core.py b/vulture/core.py
index 39f85982..b3c845cd 100644
--- a/vulture/core.py
+++ b/vulture/core.py
@@ -6,7 +6,6 @@
 import string
 import sys
 
-from pathspec import PathSpec
 from vulture import lines
 from vulture import noqa
 from vulture import utils
@@ -115,13 +114,6 @@ def _ignore_variable(filename, varname):
     )
 
 
-def _get_gitignore_pathspec():
-    if (gitignore := Path(".gitignore").resolve()).is_file():
-        with gitignore.open() as fh:
-            return PathSpec.from_lines("gitwildmatch", fh)
-    return PathSpec.from_lines("gitwildmatch", [])
-
-
 class Item:
     """
     Hold the name, type and location of defined code.
@@ -271,16 +263,9 @@ def prepare_pattern(pattern):
             return pattern
 
         exclude = [prepare_pattern(pattern) for pattern in (exclude or [])]
-        gitignore = _get_gitignore_pathspec()
 
         def exclude_path(path):
-            # If no exclude patterns are provided via the CLI or
-            # a TOML file, use .gitignore patterns to inform exclusion.
-            return (
-                _match(path, exclude, case=False)
-                if exclude
-                else gitignore.match_file(path)
-            )
+            return _match(path, exclude, case=False)
 
         paths = [Path(path) for path in paths]