bpo-47152: Move sources of the _sre module into a subdirectory (GH-32290)

diff --git a/Lib/re/_constants.py b/Lib/re/_constants.py
index 5317fd53e9c5a616b282781f9f8c0192e70f6e4f..327ba548118b3b612e01ebdea519c3fba54d54ea 100644 (file)
--- a/Lib/re/_constants.py
+++ b/Lib/re/_constants.py
@@ -234,7 +234,7 @@ if __name__ == "__main__":
  *
  * Copyright (c) 1997-2001 by Secret Labs AB.  All rights reserved.
  *
- * See the _sre.c file for information on usage and redistribution.
+ * See the sre.c file for information on usage and redistribution.
  */
 
 """)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index f94ba93cff91ccf0c4c0ac04b2830a13762b26ed..c1e58f7315f49f4d4725ec02785bb62f9dde3a2a 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1226,7 +1226,7 @@ Programs/python.o: $(srcdir)/Programs/python.c
 Programs/_testembed.o: $(srcdir)/Programs/_testembed.c Programs/test_frozenmain.h
        $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c
 
-Modules/_sre.o: $(srcdir)/Modules/_sre.c $(srcdir)/Modules/sre.h $(srcdir)/Modules/sre_constants.h $(srcdir)/Modules/sre_lib.h
+Modules/_sre/sre.o: $(srcdir)/Modules/_sre/sre.c $(srcdir)/Modules/_sre/sre.h $(srcdir)/Modules/_sre/sre_constants.h $(srcdir)/Modules/_sre/sre_lib.h
 
 Modules/posixmodule.o: $(srcdir)/Modules/posixmodule.c $(srcdir)/Modules/posixmodule.h
 

diff --git a/Modules/Setup.bootstrap.in b/Modules/Setup.bootstrap.in
index ec724978f319b4190576b298e9872e9c10d076b1..e3e9b96b0630dfaab4739978c81f1e5010e48285 100644 (file)
--- a/Modules/Setup.bootstrap.in
+++ b/Modules/Setup.bootstrap.in
@@ -18,7 +18,7 @@ _collections _collectionsmodule.c
 errno errnomodule.c
 _io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
 itertools itertoolsmodule.c
-_sre _sre.c
+_sre _sre/sre.c
 _thread _threadmodule.c
 time timemodule.c
 _weakref _weakref.c

diff --git a/Modules/clinic/_sre.c.h b/Modules/_sre/clinic/sre.c.h
similarity index 100%
rename from Modules/clinic/_sre.c.h
rename to Modules/_sre/clinic/sre.c.h

diff --git a/Modules/_sre.c b/Modules/_sre/sre.c
similarity index 99%
rename from Modules/_sre.c
rename to Modules/_sre/sre.c
index 506363d6fbf6d769c6610ba63e9fe941cbfe0c03..491734f243849b554d7bab41d9100c1783652113 100644 (file)
--- a/Modules/_sre.c
+++ b/Modules/_sre/sre.c
@@ -2788,7 +2788,7 @@ pattern_richcompare(PyObject *lefto, PyObject *righto, int op)
     return PyBool_FromLong(cmp);
 }
 
-#include "clinic/_sre.c.h"
+#include "clinic/sre.c.h"
 
 static PyMethodDef pattern_methods[] = {
     _SRE_SRE_PATTERN_MATCH_METHODDEF

diff --git a/Modules/sre.h b/Modules/_sre/sre.h
similarity index 97%
rename from Modules/sre.h
rename to Modules/_sre/sre.h
index e2c5277aefb5d91db02d2bbbf3a6aeaab0f15bf0..129f5595269f5b871ae6cf2015ccfbd7843030ac 100644 (file)
--- a/Modules/sre.h
+++ b/Modules/_sre/sre.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1997-2001 by Secret Labs AB.  All rights reserved.
  *
- * See the _sre.c file for information on usage and redistribution.
+ * See the sre.c file for information on usage and redistribution.
  */
 
 #ifndef SRE_INCLUDED

diff --git a/Modules/sre_constants.h b/Modules/_sre/sre_constants.h
similarity index 97%
rename from Modules/sre_constants.h
rename to Modules/_sre/sre_constants.h
index 8b249493bd5cd9434bd469ff69864ab4f7c0d682..3e3643144a92c47ad37514370b3703ca9ef364a8 100644 (file)
--- a/Modules/sre_constants.h
+++ b/Modules/_sre/sre_constants.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1997-2001 by Secret Labs AB.  All rights reserved.
  *
- * See the _sre.c file for information on usage and redistribution.
+ * See the sre.c file for information on usage and redistribution.
  */
 
 #define SRE_MAGIC 20220402

diff --git a/Modules/sre_lib.h b/Modules/_sre/sre_lib.h
similarity index 99%
rename from Modules/sre_lib.h
rename to Modules/_sre/sre_lib.h
index 1cc926d956c63f06c42891d793a24df1dfc18929..34cd0552532f704c9e7f570c8c449c9c179ece4c 100644 (file)
--- a/Modules/sre_lib.h
+++ b/Modules/_sre/sre_lib.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1997-2001 by Secret Labs AB.  All rights reserved.
  *
- * See the _sre.c file for information on usage and redistribution.
+ * See the sre.c file for information on usage and redistribution.
  */
 
 /* String matching engine */

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 5e6e703df9123e6f4c1eb07164ef95265eca8e5c..9894e37cb78e1edf6fe055d2ca686470cd51b0d0 100644 (file)
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -296,9 +296,6 @@
     <ClInclude Include="..\Modules\_math.h" />
     <ClInclude Include="..\Modules\hashtable.h" />
     <ClInclude Include="..\Modules\rotatingtree.h" />
-    <ClInclude Include="..\Modules\sre.h" />
-    <ClInclude Include="..\Modules\sre_constants.h" />
-    <ClInclude Include="..\Modules\sre_lib.h" />
     <ClInclude Include="..\Modules\_io\_iomodule.h" />
     <ClInclude Include="..\Modules\cjkcodecs\alg_jisx0201.h" />
     <ClInclude Include="..\Modules\cjkcodecs\cjkcodecs.h" />
@@ -359,7 +356,10 @@
     <ClCompile Include="..\Modules\_pickle.c" />
     <ClCompile Include="..\Modules\_randommodule.c" />
     <ClCompile Include="..\Modules\_sha3\sha3module.c" />
-    <ClCompile Include="..\Modules\_sre.c" />
+    <ClCompile Include="..\Modules\_sre\sre.c" />
+    <ClInclude Include="..\Modules\_sre\sre.h" />
+    <ClInclude Include="..\Modules\_sre\sre_constants.h" />
+    <ClInclude Include="..\Modules\_sre\sre_lib.h" />
     <ClCompile Include="..\Modules\_stat.c" />
     <ClCompile Include="..\Modules\_struct.c" />
     <ClCompile Include="..\Modules\_weakref.c" />

diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 86049a2a5df5d0fd7f3abef8ec64967c6ffe3720..55fca4982e0f3906e131d5c7a99e76b58037080a 100644 (file)
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -240,15 +240,6 @@
     <ClInclude Include="..\Modules\rotatingtree.h">
       <Filter>Modules</Filter>
     </ClInclude>
-    <ClInclude Include="..\Modules\sre.h">
-      <Filter>Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Modules\sre_constants.h">
-      <Filter>Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Modules\sre_lib.h">
-      <Filter>Modules</Filter>
-    </ClInclude>
     <ClInclude Include="..\Modules\_io\_iomodule.h">
       <Filter>Modules\_io</Filter>
     </ClInclude>
@@ -731,9 +722,18 @@
     <ClCompile Include="..\Modules\_sha3\sha3module.c">
       <Filter>Modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\_sre.c">
+    <ClCompile Include="..\Modules\_sre\sre.c">
       <Filter>Modules</Filter>
     </ClCompile>
+    <ClInclude Include="..\Modules\_sre\sre.h">
+      <Filter>Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Modules\_sre\sre_constants.h">
+      <Filter>Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Modules\_sre\sre_lib.h">
+      <Filter>Modules</Filter>
+    </ClInclude>
     <ClCompile Include="..\Modules\_statisticsmodule.c">
       <Filter>Modules</Filter>
     </ClCompile>

diff --git a/Tools/c-analyzer/cpython/_parser.py b/Tools/c-analyzer/cpython/_parser.py
index e58871cf73dcec2fbeb460761904b4fae455a96e..19000096fc9c3f7add6dcbdd595bcf07e9b38de2 100644 (file)
--- a/Tools/c-analyzer/cpython/_parser.py
+++ b/Tools/c-analyzer/cpython/_parser.py
@@ -148,7 +148,7 @@ Modules/_io/*.c     Py_BUILD_CORE   1
 Modules/_localemodule.c        Py_BUILD_CORE   1
 Modules/_operator.c    Py_BUILD_CORE   1
 Modules/_posixsubprocess.c     Py_BUILD_CORE   1
-Modules/_sre.c Py_BUILD_CORE   1
+Modules/_sre/sre.c     Py_BUILD_CORE   1
 Modules/_threadmodule.c        Py_BUILD_CORE   1
 Modules/_tracemalloc.c Py_BUILD_CORE   1
 Modules/_weakref.c     Py_BUILD_CORE   1
@@ -262,8 +262,8 @@ Modules/expat/xmlparse.c    XML_POOR_ENTROPY        1
 Modules/_dbmmodule.c   HAVE_GDBM_DASH_NDBM_H   1
 
 # others
-Modules/sre_lib.h      LOCAL(type)     static inline type
-Modules/sre_lib.h      SRE(F)  sre_ucs2_##F
+Modules/_sre/sre_lib.h LOCAL(type)     static inline type
+Modules/_sre/sre_lib.h SRE(F)  sre_ucs2_##F
 Objects/stringlib/codecs.h     STRINGLIB_IS_UNICODE    1
 Include/internal/pycore_bitutils.h     _Py__has_builtin(B)     0
 

diff --git a/configure b/configure
index bb1aa7568233d5e83ca373d261cf7029f27ae471..a06d4c9b41d8834a86acf197325703fb89ee308a 100755 (executable)
--- a/configure
+++ b/configure
@@ -20557,6 +20557,7 @@ SRCDIRS="\
   Modules/_multiprocessing \
   Modules/_sha3 \
   Modules/_sqlite \
+  Modules/_sre \
   Modules/_xxtestfuzz \
   Modules/cjkcodecs \
   Modules/expat \

diff --git a/configure.ac b/configure.ac
index 9f0a50ec852b6482994cfc6ea040d8bc5492a61e..abcd379d705fba36a695bd0a5e74438814ab6ec4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5992,6 +5992,7 @@ SRCDIRS="\
   Modules/_multiprocessing \
   Modules/_sha3 \
   Modules/_sqlite \
+  Modules/_sre \
   Modules/_xxtestfuzz \
   Modules/cjkcodecs \
   Modules/expat \