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

bpo-45847: Port _socket to PY_STDLIB_MOD (GH-29713)

This commit is contained in:
Erlend Egeberg Aasland 2021-11-23 08:52:05 +01:00 committed by GitHub
parent 758a23d1c4
commit d82f2caf94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/Setup.stdlib.in
View File

@ -109,6 +109,7 @@
@MODULE__POSIXSUBPROCESS_TRUE@_posixsubprocess _posixsubprocess.c @MODULE__POSIXSUBPROCESS_TRUE@_posixsubprocess _posixsubprocess.c
@MODULE_RESOURCE_TRUE@resource resource.c @MODULE_RESOURCE_TRUE@resource resource.c
@MODULE_SELECT_TRUE@select selectmodule.c @MODULE_SELECT_TRUE@select selectmodule.c
@MODULE__SOCKET_TRUE@_socket socketmodule.c
# AIX has shadow passwords, but does not provide getspent API # AIX has shadow passwords, but does not provide getspent API
@MODULE_SPWD_TRUE@spwd spwdmodule.c @MODULE_SPWD_TRUE@spwd spwdmodule.c
@MODULE_SYSLOG_TRUE@syslog syslogmodule.c @MODULE_SYSLOG_TRUE@syslog syslogmodule.c

15
configure vendored
View File

@ -724,6 +724,8 @@ MODULE__TYPING_FALSE
MODULE__TYPING_TRUE MODULE__TYPING_TRUE
MODULE__STRUCT_FALSE MODULE__STRUCT_FALSE
MODULE__STRUCT_TRUE MODULE__STRUCT_TRUE
MODULE__SOCKET_FALSE
MODULE__SOCKET_TRUE
MODULE_SELECT_FALSE MODULE_SELECT_FALSE
MODULE_SELECT_TRUE MODULE_SELECT_TRUE
MODULE__RANDOM_FALSE MODULE__RANDOM_FALSE
@ -20577,6 +20579,15 @@ else
fi fi
as_fn_append MODULE_BLOCK "MODULE_SELECT=yes$as_nl" as_fn_append MODULE_BLOCK "MODULE_SELECT=yes$as_nl"
if true; then
MODULE__SOCKET_TRUE=
MODULE__SOCKET_FALSE='#'
else
MODULE__SOCKET_TRUE='#'
MODULE__SOCKET_FALSE=
fi
as_fn_append MODULE_BLOCK "MODULE__SOCKET=yes$as_nl"
if true; then if true; then
MODULE__STRUCT_TRUE= MODULE__STRUCT_TRUE=
MODULE__STRUCT_FALSE='#' MODULE__STRUCT_FALSE='#'
@ -22099,6 +22110,10 @@ if test -z "${MODULE_SELECT_TRUE}" && test -z "${MODULE_SELECT_FALSE}"; then
as_fn_error $? "conditional \"MODULE_SELECT\" was never defined. as_fn_error $? "conditional \"MODULE_SELECT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${MODULE__SOCKET_TRUE}" && test -z "${MODULE__SOCKET_FALSE}"; then
as_fn_error $? "conditional \"MODULE__SOCKET\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MODULE__STRUCT_TRUE}" && test -z "${MODULE__STRUCT_FALSE}"; then if test -z "${MODULE__STRUCT_TRUE}" && test -z "${MODULE__STRUCT_FALSE}"; then
as_fn_error $? "conditional \"MODULE__STRUCT\" was never defined. as_fn_error $? "conditional \"MODULE__STRUCT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5

1
configure.ac
View File

@ -6137,6 +6137,7 @@ PY_STDLIB_MOD_SIMPLE([_posixsubprocess])
PY_STDLIB_MOD_SIMPLE([_queue]) PY_STDLIB_MOD_SIMPLE([_queue])
PY_STDLIB_MOD_SIMPLE([_random]) PY_STDLIB_MOD_SIMPLE([_random])
PY_STDLIB_MOD_SIMPLE([select]) PY_STDLIB_MOD_SIMPLE([select])
PY_STDLIB_MOD_SIMPLE([_socket])
PY_STDLIB_MOD_SIMPLE([_struct]) PY_STDLIB_MOD_SIMPLE([_struct])
PY_STDLIB_MOD_SIMPLE([_typing]) PY_STDLIB_MOD_SIMPLE([_typing])
PY_STDLIB_MOD_SIMPLE([_xxsubinterpreters]) PY_STDLIB_MOD_SIMPLE([_xxsubinterpreters])

6
setup.py
View File

@ -1034,6 +1034,8 @@ class PyBuildExt(build_ext):
self.addext(Extension('fcntl', ['fcntlmodule.c'])) self.addext(Extension('fcntl', ['fcntlmodule.c']))
# grp(3) # grp(3)
self.addext(Extension('grp', ['grpmodule.c'])) self.addext(Extension('grp', ['grpmodule.c']))
self.addext(Extension('_socket', ['socketmodule.c']))
self.addext(Extension('spwd', ['spwdmodule.c'])) self.addext(Extension('spwd', ['spwdmodule.c']))
# select(2); not on ancient System V # select(2); not on ancient System V
@ -1254,9 +1256,6 @@ class PyBuildExt(build_ext):
self.add(Extension('_crypt', ['_cryptmodule.c'], libraries=libs)) self.add(Extension('_crypt', ['_cryptmodule.c'], libraries=libs))
def detect_socket(self):
self.add(Extension('_socket', ['socketmodule.c']))
def detect_dbm_gdbm(self): def detect_dbm_gdbm(self):
# Modules that provide persistent dictionary-like semantics. You will # Modules that provide persistent dictionary-like semantics. You will
# probably want to arrange for at least one of them to be available on # probably want to arrange for at least one of them to be available on
@ -1460,7 +1459,6 @@ class PyBuildExt(build_ext):
self.detect_test_extensions() self.detect_test_extensions()
self.detect_readline_curses() self.detect_readline_curses()
self.detect_crypt() self.detect_crypt()
self.detect_socket()
self.detect_openssl_hashlib() self.detect_openssl_hashlib()
self.detect_hash_builtins() self.detect_hash_builtins()
self.detect_dbm_gdbm() self.detect_dbm_gdbm()