Author: Matti Picus <[email protected]>
Branch: cffi-libs
Changeset: r96598:d03b3d0c6b2e
Date: 2019-05-10 06:08 -0700
http://bitbucket.org/pypy/pypy/changeset/d03b3d0c6b2e/
Log: remove _ssl and dead code from module options
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -33,10 +33,11 @@
"_socket", "unicodedata", "mmap", "fcntl", "_locale", "pwd",
"select", "zipimport", "_lsprof", "crypt", "signal", "_rawffi", "termios",
"zlib", "bz2", "struct", "_hashlib", "_md5", "_sha", "_minimal_curses",
- "cStringIO", "thread", "itertools", "pyexpat", "_ssl", "cpyext", "array",
+ "cStringIO", "thread", "itertools", "pyexpat", "cpyext", "array",
"binascii", "_multiprocessing", '_warnings', "_collections",
"_multibytecodec", "micronumpy", "_continuation", "_cffi_backend",
- "_csv", "_cppyy", "_pypyjson", "_jitlog"
+ "_csv", "_cppyy", "_pypyjson", "_jitlog",
+ # _ssl
])
import rpython.rlib.rvmprof.cintf
@@ -109,43 +110,6 @@
module_suggests["cpyext"].append(("translation.shared", True))
-# NOTE: this dictionary is not used any more
-module_import_dependencies = {
- # no _rawffi if importing rpython.rlib.clibffi raises ImportError
- # or CompilationError or py.test.skip.Exception
- "_rawffi" : ["rpython.rlib.clibffi"],
-
- "zlib" : ["rpython.rlib.rzlib"],
- "bz2" : ["pypy.module.bz2.interp_bz2"],
- "pyexpat" : ["pypy.module.pyexpat.interp_pyexpat"],
- "_ssl" : ["pypy.module._ssl.interp_ssl"],
- "_hashlib" : ["pypy.module._ssl.interp_ssl"],
- "_minimal_curses": ["pypy.module._minimal_curses.fficurses"],
- "_continuation": ["rpython.rlib.rstacklet"],
- "_vmprof" : ["pypy.module._vmprof.interp_vmprof"],
- "faulthandler" : ["pypy.module._vmprof.interp_vmprof"],
- }
-
-def get_module_validator(modname):
- # NOTE: this function is not used any more
- if modname in module_import_dependencies:
- modlist = module_import_dependencies[modname]
- def validator(config):
- from rpython.rtyper.tool.rffi_platform import CompilationError
- try:
- for name in modlist:
- __import__(name)
- except (ImportError, CompilationError, py.test.skip.Exception) as
e:
- errcls = e.__class__.__name__
- raise Exception(
- "The module %r is disabled\n" % (modname,) +
- "because importing %s raised %s\n" % (name, errcls) +
- str(e))
- return validator
- else:
- return None
-
-
pypy_optiondescription = OptionDescription("objspace", "Object Space Options",
[
OptionDescription("usemodules", "Which Modules should be used", [
BoolOption(modname, "use module %s" % (modname, ),
@@ -154,7 +118,7 @@
requires=module_dependencies.get(modname, []),
suggests=module_suggests.get(modname, []),
negation=modname not in essential_modules,
- ) #validator=get_module_validator(modname))
+ )
for modname in all_modules]),
BoolOption("allworkingmodules", "use as many working modules as possible",
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
