Disable _thread on wasm

Author: coolreader18

Lib/importlib/_bootstrap.py

@@ -1149,12 +1149,21 @@ def _setup(sys_module, _imp_module):
 
     # Directly load built-in modules needed during bootstrap.
     self_module = sys.modules[__name__]
-    for builtin_name in ('_thread', '_warnings', '_weakref'):
+    for builtin_name in ('_warnings', '_weakref'):
         if builtin_name not in sys.modules:
             builtin_module = _builtin_from_name(builtin_name)
         else:
             builtin_module = sys.modules[builtin_name]
         setattr(self_module, builtin_name, builtin_module)
+    # _thread was part of the above loop, but other parts of the code allow for it
+    # to be None, so we handle it separately here
+    builtin_name = '_thread'
+    if builtin_name in sys.modules:
+        builtin_module = sys.modules[builtin_name]
+    else:
+        builtin_spec = BuiltinImporter.find_spec(builtin_name)
+        builtin_module = builtin_spec and _load_unlocked(builtin_spec)
+    setattr(self_module, builtin_name, builtin_module)
 
 
 def _install(sys_module, _imp_module):

vm/src/stdlib/mod.rs

@@ -30,6 +30,7 @@ pub mod socket;
 mod string;
 #[cfg(feature = "rustpython-compiler")]
 mod symtable;
+#[cfg(not(target_arch = "wasm32"))]
 mod thread;
 mod time_module;
 #[cfg(feature = "rustpython-parser")]
@@ -89,7 +90,6 @@ pub fn get_module_inits() -> HashMap<String, StdlibInitFunc> {
         "_random".to_owned() => Box::new(random::make_module),
         "_string".to_owned() => Box::new(string::make_module),
         "_struct".to_owned() => Box::new(pystruct::make_module),
-        "_thread".to_owned() => Box::new(thread::make_module),
         "time".to_owned() => Box::new(time_module::make_module),
         "_weakref".to_owned() => Box::new(weakref::make_module),
         "_imp".to_owned() => Box::new(imp::make_module),
@@ -130,6 +130,7 @@ pub fn get_module_inits() -> HashMap<String, StdlibInitFunc> {
         #[cfg(feature = "ssl")]
         modules.insert("_ssl".to_owned(), Box::new(ssl::make_module));
         modules.insert("_subprocess".to_owned(), Box::new(subprocess::make_module));
+        modules.insert("_thread".to_owned(), Box::new(thread::make_module));
         #[cfg(not(target_os = "redox"))]
         modules.insert("zlib".to_owned(), Box::new(zlib::make_module));
         modules.insert(