From 0895c2a066c64c84cab0821886dfa66efc1bdc2f Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Wed, 12 Oct 2022 10:09:21 +0200
Subject: [PATCH] gh-97669: Create Tools/patchcheck/ directory (#98186)

Move patchcheck.py, reindent.py and untabify.py scripts to a new
Tools/patchcheck/ directory.
---
 .azure-pipelines/posix-steps.yml            | 2 +-
 Lib/test/test_tools/test_reindent.py        | 4 ++--
 Makefile.pre.in                             | 4 ++--
 Tools/{scripts => patchcheck}/patchcheck.py | 0
 Tools/{scripts => patchcheck}/reindent.py   | 0
 Tools/{scripts => patchcheck}/untabify.py   | 0
 Tools/scripts/README                        | 3 ---
 7 files changed, 5 insertions(+), 8 deletions(-)
 rename Tools/{scripts => patchcheck}/patchcheck.py (100%)
 rename Tools/{scripts => patchcheck}/reindent.py (100%)
 rename Tools/{scripts => patchcheck}/untabify.py (100%)

diff --git a/.azure-pipelines/posix-steps.yml b/.azure-pipelines/posix-steps.yml
index 29b43e09344..9d7c5e1279f 100644
--- a/.azure-pipelines/posix-steps.yml
+++ b/.azure-pipelines/posix-steps.yml
@@ -68,7 +68,7 @@ steps:
 - ${{ if eq(parameters.patchcheck, 'true') }}:
   - script: |
       git fetch origin
-      ./python Tools/scripts/patchcheck.py --ci true
+      ./python Tools/patchcheck/patchcheck.py --ci true
     displayName: 'Run patchcheck.py'
     condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
 
diff --git a/Lib/test/test_tools/test_reindent.py b/Lib/test/test_tools/test_reindent.py
index 34df0c5d511..3b0c793a38e 100644
--- a/Lib/test/test_tools/test_reindent.py
+++ b/Lib/test/test_tools/test_reindent.py
@@ -9,12 +9,12 @@ import unittest
 from test.support.script_helper import assert_python_ok
 from test.support import findfile
 
-from test.test_tools import scriptsdir, skip_if_missing
+from test.test_tools import toolsdir, skip_if_missing
 
 skip_if_missing()
 
 class ReindentTests(unittest.TestCase):
-    script = os.path.join(scriptsdir, 'reindent.py')
+    script = os.path.join(toolsdir, 'patchcheck', 'reindent.py')
 
     def test_noargs(self):
         assert_python_ok(self.script)
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4602db69d15..7e2567173bc 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2386,7 +2386,7 @@ Python/dtoa.o: Python/dtoa.c
 
 # Run reindent on the library
 reindent:
-	./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
+	./$(BUILDPYTHON) $(srcdir)/Tools/patchcheck/reindent.py -r $(srcdir)/Lib
 
 # Rerun configure with the same options as it was run last time,
 # provided the config.status script exists
@@ -2546,7 +2546,7 @@ funny:
 
 # Perform some verification checks on any modified files.
 patchcheck: all
-	$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
+	$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/patchcheck/patchcheck.py
 
 check-limited-abi: all
 	$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/stable_abi.py --all $(srcdir)/Misc/stable_abi.toml
diff --git a/Tools/scripts/patchcheck.py b/Tools/patchcheck/patchcheck.py
similarity index 100%
rename from Tools/scripts/patchcheck.py
rename to Tools/patchcheck/patchcheck.py
diff --git a/Tools/scripts/reindent.py b/Tools/patchcheck/reindent.py
similarity index 100%
rename from Tools/scripts/reindent.py
rename to Tools/patchcheck/reindent.py
diff --git a/Tools/scripts/untabify.py b/Tools/patchcheck/untabify.py
similarity index 100%
rename from Tools/scripts/untabify.py
rename to Tools/patchcheck/untabify.py
diff --git a/Tools/scripts/README b/Tools/scripts/README
index 9943d4c42fc..b9522681595 100644
--- a/Tools/scripts/README
+++ b/Tools/scripts/README
@@ -5,9 +5,6 @@ useful while building, extending or managing Python.
 combinerefs.py            A helper for analyzing PYTHONDUMPREFS output
 idle3                     Main program to start IDLE
 parse_html5_entities.py   Utility for parsing HTML5 entity definitions
-patchcheck.py             Perform common checks and cleanup before committing
 pydoc3                    Python documentation browser
-reindent.py               Change .py files to use 4-space indents
 run_tests.py              Run the test suite with more sensible default options
 stable_abi.py             Stable ABI checks and file generators.
-untabify.py               Replace tabs with spaces in argument files