RustPython
diff --git a/‎vm/src/stdlib/nt.rs
Lines changed: 1 addition & 2 deletions b/‎vm/src/stdlib/nt.rs
Lines changed: 1 addition & 2 deletions
diff --git a/‎vm/src/stdlib/os.rs
Lines changed: 1 addition & 1 deletion b/‎vm/src/stdlib/os.rs
Lines changed: 1 addition & 1 deletion
diff --git a/‎vm/src/vm/vm_new.rs
Lines changed: 9 additions & 0 deletions b/‎vm/src/vm/vm_new.rs
Lines changed: 9 additions & 0 deletions
@@ -16,8 +16,7 @@ pub(crate) mod module {
         builtins::{PyDictRef, PyStrRef, PyTupleRef},
         common::{crt_fd::Fd, os::last_os_error, suppress_iph},
         convert::ToPyException,
-        function::Either,
-        function::OptionalArg,
+        function::{Either, OptionalArg},
         ospath::OsPath,
         stdlib::os::{errno_err, DirFd, FollowSymlinks, SupportFunc, TargetIsDirectory, _os},
         PyResult, TryFromObject, VirtualMachine,
 
@@ -407,7 +407,7 @@ pub(super) mod _os {
             return Err(vm.new_value_error("embedded null byte".to_string()));
         }
         if key.is_empty() || key.contains('=') {
-            return Err(vm.new_value_error("illegal environment variable name".to_string()));
+            return Err(vm.new_errno_error(22, "Invalid argument".to_owned()));
         }
         env::remove_var(key);
         Ok(())
 
@@ -189,6 +189,15 @@ impl VirtualMachine {
         self.new_exception_msg(os_error, msg)
     }
 
+    pub fn new_errno_error(&self, errno: i32, msg: String) -> PyBaseExceptionRef {
+        let vm = self;
+        let exc_type =
+            crate::exceptions::errno_to_exc_type(errno, vm).unwrap_or(vm.ctx.exceptions.os_error);
+
+        let errno_obj = vm.new_pyobj(errno);
+        vm.new_exception(exc_type.to_owned(), vec![errno_obj, vm.new_pyobj(msg)])
+    }
+
     pub fn new_system_error(&self, msg: String) -> PyBaseExceptionRef {
         let sys_error = self.ctx.exceptions.system_error.to_owned();
         self.new_exception_msg(sys_error, msg)
Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ pub(super) mod _os {`
`407`	`407`	`return Err(vm.new_value_error("embedded null byte".to_string()));`
`408`	`408`	`}`
`409`	`409`	`if key.is_empty() \|\| key.contains('=') {`
`410`		`- return Err(vm.new_value_error("illegal environment variable name".to_string()));`
	`410`	`+ return Err(vm.new_errno_error(22, "Invalid argument".to_owned()));`
`411`	`411`	`}`
`412`	`412`	`env::remove_var(key);`
`413`	`413`	`Ok(())`