mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-11 11:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-40280: Get help() working and more (GH-30858)

Browse source
This commit is contained in:
Christian Heimes 2022-01-24 23:02:01 +02:00 • committed by GitHub
parent 80e1def9de
commit d5fd438b38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Tools/wasm/wasm_assets.py
View file

@ -71,7 +71,11 @@ OMIT_FILES = (
"smtplib.py", "smtplib.py",
"socketserver.py", "socketserver.py",
"telnetlib.py", "telnetlib.py",
"urllib/", # keep urllib.parse for pydoc
"urllib/error.py",
"urllib/request.py",
"urllib/response.py",
"urllib/robotparser.py",
"wsgiref/", "wsgiref/",
"xmlrpc/", "xmlrpc/",
# dbm / gdbm # dbm / gdbm

16
configure generated vendored
View file

@ -7684,7 +7684,7 @@ case $ac_sys_system/$ac_sys_emscripten_target in #(
LDFLAGS_NODIST="$LDFLAGS_NODIST -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 -s NODERAWFS=1 -s EXIT_RUNTIME=1 -s USE_PTHREADS -s PROXY_TO_PTHREAD" LDFLAGS_NODIST="$LDFLAGS_NODIST -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 -s NODERAWFS=1 -s EXIT_RUNTIME=1 -s USE_PTHREADS -s PROXY_TO_PTHREAD"
CFLAGS_NODIST="$CFLAGS_NODIST -pthread" CFLAGS_NODIST="$CFLAGS_NODIST -pthread"
;; #( ;; #(
WASI) : WASI/*) :
$as_echo "#define _WASI_EMULATED_SIGNAL 1" >>confdefs.h $as_echo "#define _WASI_EMULATED_SIGNAL 1" >>confdefs.h
@ -21345,6 +21345,8 @@ $as_echo_n "checking for additional Modules/Setup files... " >&6; }
case $ac_sys_system in #( case $ac_sys_system in #(
Emscripten) : Emscripten) :
MODULES_SETUP_STDLIB=Modules/Setup.stdlib ;; #( MODULES_SETUP_STDLIB=Modules/Setup.stdlib ;; #(
WASI) :
MODULES_SETUP_STDLIB=Modules/Setup.stdlib ;; #(
*) : *) :
MODULES_SETUP_STDLIB= MODULES_SETUP_STDLIB=
;; ;;
@ -23421,7 +23423,7 @@ $as_echo_n "checking for stdlib extension module _testimportmultiple... " >&6; }
py_cv_module__testimportmultiple=n/a ;; #( py_cv_module__testimportmultiple=n/a ;; #(
*) : *) :
if test "$TEST_MODULES" = yes; then : if test "$TEST_MODULES" = yes; then :
if true; then : if test "$ac_cv_func_dlopen" = yes; then :
py_cv_module__testimportmultiple=yes py_cv_module__testimportmultiple=yes
else else
py_cv_module__testimportmultiple=missing py_cv_module__testimportmultiple=missing
@ -23457,7 +23459,7 @@ $as_echo_n "checking for stdlib extension module _testmultiphase... " >&6; }
py_cv_module__testmultiphase=n/a ;; #( py_cv_module__testmultiphase=n/a ;; #(
*) : *) :
if test "$TEST_MODULES" = yes; then : if test "$TEST_MODULES" = yes; then :
if true; then : if test "$ac_cv_func_dlopen" = yes; then :
py_cv_module__testmultiphase=yes py_cv_module__testmultiphase=yes
else else
py_cv_module__testmultiphase=missing py_cv_module__testmultiphase=missing
@ -23565,8 +23567,8 @@ $as_echo_n "checking for stdlib extension module xxlimited... " >&6; }
*xxlimited*) : *xxlimited*) :
py_cv_module_xxlimited=n/a ;; #( py_cv_module_xxlimited=n/a ;; #(
*) : *) :
if test "$with_trace_refs" = "no" -a "$ac_sys_system" != "Emscripten"; then : if test "$with_trace_refs" = "no"; then :
if true; then : if test "$ac_cv_func_dlopen" = yes; then :
py_cv_module_xxlimited=yes py_cv_module_xxlimited=yes
else else
py_cv_module_xxlimited=missing py_cv_module_xxlimited=missing
@ -23601,8 +23603,8 @@ $as_echo_n "checking for stdlib extension module xxlimited_35... " >&6; }
*xxlimited_35*) : *xxlimited_35*) :
py_cv_module_xxlimited_35=n/a ;; #( py_cv_module_xxlimited_35=n/a ;; #(
*) : *) :
if test "$with_trace_refs" = "no" -a "$ac_sys_system" != "Emscripten"; then : if test "$with_trace_refs" = "no"; then :
if true; then : if test "$ac_cv_func_dlopen" = yes; then :
py_cv_module_xxlimited_35=yes py_cv_module_xxlimited_35=yes
else else
py_cv_module_xxlimited_35=missing py_cv_module_xxlimited_35=missing

11
configure.ac
View file

@ -1850,7 +1850,7 @@ AS_CASE([$ac_sys_system/$ac_sys_emscripten_target],
LDFLAGS_NODIST="$LDFLAGS_NODIST -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 -s NODERAWFS=1 -s EXIT_RUNTIME=1 -s USE_PTHREADS -s PROXY_TO_PTHREAD" LDFLAGS_NODIST="$LDFLAGS_NODIST -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 -s NODERAWFS=1 -s EXIT_RUNTIME=1 -s USE_PTHREADS -s PROXY_TO_PTHREAD"
CFLAGS_NODIST="$CFLAGS_NODIST -pthread" CFLAGS_NODIST="$CFLAGS_NODIST -pthread"
], ],
[WASI], [ [WASI/*], [
AC_DEFINE([_WASI_EMULATED_SIGNAL], [1], [Define to 1 if you want to emulate signals on WASI]) AC_DEFINE([_WASI_EMULATED_SIGNAL], [1], [Define to 1 if you want to emulate signals on WASI])
LIBS="$LIBS -lwasi-emulated-signal" LIBS="$LIBS -lwasi-emulated-signal"
echo "#define _WASI_EMULATED_SIGNAL 1" >> confdefs.h echo "#define _WASI_EMULATED_SIGNAL 1" >> confdefs.h
@ -6407,6 +6407,7 @@ dnl Use Modules/Setup.stdlib as additional provider?
AC_MSG_CHECKING([for additional Modules/Setup files]) AC_MSG_CHECKING([for additional Modules/Setup files])
AS_CASE([$ac_sys_system], AS_CASE([$ac_sys_system],
[Emscripten], [MODULES_SETUP_STDLIB=Modules/Setup.stdlib], [Emscripten], [MODULES_SETUP_STDLIB=Modules/Setup.stdlib],
[WASI], [MODULES_SETUP_STDLIB=Modules/Setup.stdlib],
[MODULES_SETUP_STDLIB=] [MODULES_SETUP_STDLIB=]
) )
AC_MSG_RESULT([$MODULES_SETUP_STDLIB]) AC_MSG_RESULT([$MODULES_SETUP_STDLIB])
@ -6599,16 +6600,16 @@ dnl test modules
PY_STDLIB_MOD([_testcapi], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testcapi], [test "$TEST_MODULES" = yes])
PY_STDLIB_MOD([_testinternalcapi], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testinternalcapi], [test "$TEST_MODULES" = yes])
PY_STDLIB_MOD([_testbuffer], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testbuffer], [test "$TEST_MODULES" = yes])
PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes])
PY_STDLIB_MOD([_ctypes_test], [test "$TEST_MODULES" = yes], [], [], [-lm]) PY_STDLIB_MOD([_ctypes_test], [test "$TEST_MODULES" = yes], [], [], [-lm])
dnl Limited API template modules. dnl Limited API template modules.
dnl The limited C API is not compatible with the Py_TRACE_REFS macro. dnl The limited C API is not compatible with the Py_TRACE_REFS macro.
dnl Emscripten does not support shared libraries yet. dnl Emscripten does not support shared libraries yet.
PY_STDLIB_MOD([xxlimited], [test "$with_trace_refs" = "no" -a "$ac_sys_system" != "Emscripten"]) PY_STDLIB_MOD([xxlimited], [test "$with_trace_refs" = "no"], [test "$ac_cv_func_dlopen" = yes])
PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no" -a "$ac_sys_system" != "Emscripten"]) PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_func_dlopen" = yes])
# substitute multiline block, must come after last PY_STDLIB_MOD() # substitute multiline block, must come after last PY_STDLIB_MOD()
AC_SUBST([MODULE_BLOCK]) AC_SUBST([MODULE_BLOCK])