From abcd929280bd21193b2d485f2a8b7ecf3a893acf Mon Sep 17 00:00:00 2001
From: Noah <33094578+coolreader18@users.noreply.github.com>
Date: Mon, 21 Sep 2020 10:54:13 -0500
Subject: [PATCH] Make signal->_signal

---
 vm/src/stdlib/mod.rs    |  2 +-
 vm/src/stdlib/signal.rs | 24 ++++++++++++++----------
 vm/src/vm.rs            |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/vm/src/stdlib/mod.rs b/vm/src/stdlib/mod.rs
index 05ef201ed..92ccd44b6 100644
--- a/vm/src/stdlib/mod.rs
+++ b/vm/src/stdlib/mod.rs
@@ -129,7 +129,7 @@ pub fn get_module_inits() -> HashMap<String, StdlibInitFunc> {
             "_multiprocessing".to_owned(),
             Box::new(multiprocessing::make_module),
         );
-        modules.insert("signal".to_owned(), Box::new(signal::make_module));
+        modules.insert("_signal".to_owned(), Box::new(signal::make_module));
         modules.insert("select".to_owned(), Box::new(select::make_module));
         #[cfg(feature = "ssl")]
         modules.insert("_ssl".to_owned(), Box::new(ssl::make_module));
diff --git a/vm/src/stdlib/signal.rs b/vm/src/stdlib/signal.rs
index 60e4ef128..1bb9475d1 100644
--- a/vm/src/stdlib/signal.rs
+++ b/vm/src/stdlib/signal.rs
@@ -36,7 +36,7 @@ fn assert_in_range(signum: i32, vm: &VirtualMachine) -> PyResult<()> {
     }
 }
 
-fn signal(signalnum: i32, handler: PyObjectRef, vm: &VirtualMachine) -> PyResult {
+fn _signal_signal(signalnum: i32, handler: PyObjectRef, vm: &VirtualMachine) -> PyResult {
     assert_in_range(signalnum, vm)?;
     let signal_handlers = vm
         .signal_handlers
@@ -78,7 +78,7 @@ fn signal(signalnum: i32, handler: PyObjectRef, vm: &VirtualMachine) -> PyResult
     Ok(old_handler)
 }
 
-fn getsignal(signalnum: i32, vm: &VirtualMachine) -> PyResult {
+fn _signal_getsignal(signalnum: i32, vm: &VirtualMachine) -> PyResult {
     assert_in_range(signalnum, vm)?;
     let signal_handlers = vm
         .signal_handlers
@@ -88,7 +88,7 @@ fn getsignal(signalnum: i32, vm: &VirtualMachine) -> PyResult {
 }
 
 #[cfg(unix)]
-fn alarm(time: u32) -> u32 {
+fn _signal_alarm(time: u32) -> u32 {
     let prev_time = if time == 0 {
         sig_alarm::cancel()
     } else {
@@ -119,21 +119,25 @@ pub fn check_signals(vm: &VirtualMachine) -> PyResult<()> {
     Ok(())
 }
 
-fn default_int_handler(_signum: PyObjectRef, _arg: PyObjectRef, vm: &VirtualMachine) -> PyResult {
+fn _signal_default_int_handler(
+    _signum: PyObjectRef,
+    _arg: PyObjectRef,
+    vm: &VirtualMachine,
+) -> PyResult {
     Err(vm.new_exception_empty(vm.ctx.exceptions.keyboard_interrupt.clone()))
 }
 
 pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
     let ctx = &vm.ctx;
 
-    let int_handler = ctx.new_function(default_int_handler);
+    let int_handler = named_function!(ctx, _signal, default_int_handler);
 
     let sig_dfl = ctx.new_int(SIG_DFL as u8);
     let sig_ign = ctx.new_int(SIG_IGN as u8);
 
-    let module = py_module!(vm, "signal", {
-        "signal" => ctx.new_function(signal),
-        "getsignal" => ctx.new_function(getsignal),
+    let module = py_module!(vm, "_signal", {
+        "signal" => named_function!(ctx, _signal, signal),
+        "getsignal" => named_function!(ctx, _signal, getsignal),
         "SIG_DFL" => sig_dfl.clone(),
         "SIG_IGN" => sig_ign.clone(),
         "SIGABRT" => ctx.new_int(libc::SIGABRT as u8),
@@ -161,7 +165,7 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
         vm.signal_handlers.as_ref().unwrap().borrow_mut()[signum] = py_handler;
     }
 
-    signal(libc::SIGINT, int_handler, vm).expect("Failed to set sigint handler");
+    _signal_signal(libc::SIGINT, int_handler, vm).expect("Failed to set sigint handler");
 
     module
 }
@@ -171,7 +175,7 @@ fn extend_module_platform_specific(vm: &VirtualMachine, module: &PyObjectRef) {
     let ctx = &vm.ctx;
 
     extend_module!(vm, module, {
-        "alarm" => ctx.new_function(alarm),
+        "alarm" => named_function!(ctx, _signal, alarm),
         "SIGHUP" => ctx.new_int(libc::SIGHUP as u8),
         "SIGQUIT" => ctx.new_int(libc::SIGQUIT as u8),
         "SIGTRAP" => ctx.new_int(libc::SIGTRAP as u8),
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
index d3364bd95..970986159 100644
--- a/vm/src/vm.rs
+++ b/vm/src/vm.rs
@@ -310,7 +310,7 @@ impl VirtualMachine {
 
         let mut inner_init = || -> PyResult<()> {
             #[cfg(not(target_arch = "wasm32"))]
-            import::import_builtin(self, "signal")?;
+            import::import_builtin(self, "_signal")?;
 
             #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
             {