Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 23, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5397d3
bpo-45847: Port socket to PY_STDLIB_MOD_SIMPLE
Nov 22, 2021
e45604c
Address review: remove checks
Nov 22, 2021
7d506ca
Also remove netinet/in.h check
Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Modules/Setup.stdlib.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
@MODULE__POSIXSUBPROCESS_TRUE@_posixsubprocess _posixsubprocess.c
@MODULE_RESOURCE_TRUE@resource resource.c
@MODULE_SELECT_TRUE@select selectmodule.c
@MODULE__SOCKET_TRUE@_socket socketmodule.c
# AIX has shadow passwords, but does not provide getspent API
@MODULE_SPWD_TRUE@spwd spwdmodule.c
@MODULE_SYSLOG_TRUE@syslog syslogmodule.c
Expand Down
15 changes: 15 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,8 @@ MODULE__TYPING_FALSE
MODULE__TYPING_TRUE
MODULE__STRUCT_FALSE
MODULE__STRUCT_TRUE
MODULE__SOCKET_FALSE
MODULE__SOCKET_TRUE
MODULE_SELECT_FALSE
MODULE_SELECT_TRUE
MODULE__RANDOM_FALSE
Expand Down Expand Up @@ -20573,6 +20575,15 @@ else
fi
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
MODULE__STRUCT_TRUE=
MODULE__STRUCT_FALSE='#'
Expand Down Expand Up @@ -22022,6 +22033,10 @@ if test -z "${MODULE_SELECT_TRUE}" && test -z "${MODULE_SELECT_FALSE}"; then
as_fn_error $? "conditional \"MODULE_SELECT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
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
as_fn_error $? "conditional \"MODULE__STRUCT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
Expand Down
1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6137,6 +6137,7 @@ PY_STDLIB_MOD_SIMPLE([_posixsubprocess])
PY_STDLIB_MOD_SIMPLE([_queue])
PY_STDLIB_MOD_SIMPLE([_random])
PY_STDLIB_MOD_SIMPLE([select])
PY_STDLIB_MOD_SIMPLE([_socket])
PY_STDLIB_MOD_SIMPLE([_struct])
PY_STDLIB_MOD_SIMPLE([_typing])
PY_STDLIB_MOD_SIMPLE([_xxsubinterpreters])
Expand Down
6 changes: 2 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,8 @@ def detect_simple_extensions(self):
self.addext(Extension('fcntl', ['fcntlmodule.c']))
# grp(3)
self.addext(Extension('grp', ['grpmodule.c']))

self.addext(Extension('_socket', ['socketmodule.c']))
self.addext(Extension('spwd', ['spwdmodule.c']))

# select(2); not on ancient System V
Expand Down Expand Up @@ -1254,9 +1256,6 @@ def detect_crypt(self):

self.add(Extension('_crypt', ['_cryptmodule.c'], libraries=libs))

def detect_socket(self):
self.add(Extension('_socket', ['socketmodule.c']))

def detect_dbm_gdbm(self):
# Modules that provide persistent dictionary-like semantics. You will
# probably want to arrange for at least one of them to be available on
Expand Down Expand Up @@ -1460,7 +1459,6 @@ def detect_modules(self):
self.detect_test_extensions()
self.detect_readline_curses()
self.detect_crypt()
self.detect_socket()
self.detect_openssl_hashlib()
self.detect_hash_builtins()
self.detect_dbm_gdbm()
Expand Down