Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Serhiy Storchaka 2022-04-04 10:53:26 +03:00 committed by GitHub
parent 4216dce04b
commit 1578f06c1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/re/_constants.py
View File

@ -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.
*/
""")

2
Makefile.pre.in
View File

@ -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

2
Modules/Setup.bootstrap.in
View File

@ -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

0
Modules/clinic/_sre.c.h → Modules/_sre/clinic/sre.c.h generated
View File

2
Modules/_sre.c → Modules/_sre/sre.c
View File

@ -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

2
Modules/sre.h → Modules/_sre/sre.h
View File

@ -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

2
Modules/sre_constants.h → Modules/_sre/sre_constants.h
View File

@ -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

2
Modules/sre_lib.h → Modules/_sre/sre_lib.h
View File

@ -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 */

8
PCbuild/pythoncore.vcxproj
View File

@ -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" />

20
PCbuild/pythoncore.vcxproj.filters
View File

@ -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>

6
Tools/c-analyzer/cpython/_parser.py
View File

@ -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

1
configure generated vendored
View File

@ -20557,6 +20557,7 @@ SRCDIRS="\
Modules/_multiprocessing \
Modules/_sha3 \
Modules/_sqlite \
Modules/_sre \
Modules/_xxtestfuzz \
Modules/cjkcodecs \
Modules/expat \

1
configure.ac
View File

@ -5992,6 +5992,7 @@ SRCDIRS="\
Modules/_multiprocessing \
Modules/_sha3 \
Modules/_sqlite \
Modules/_sre \
Modules/_xxtestfuzz \
Modules/cjkcodecs \
Modules/expat \