Add sys.warn_default_encoding

fanninpm · fanninpm · commit 1cecd2a2de40 · 2022-04-27T18:58:16.000-04:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -386,18 +386,27 @@ fn create_settings(matches: &ArgMatches) -> Settings {
     }
 
     let mut dev_mode = false;
+    let mut warn_default_encoding = false;
     if let Some(xopts) = matches.values_of("implementation-option") {
         settings.xopts.extend(xopts.map(|s| {
             let mut parts = s.splitn(2, '=');
             let name = parts.next().unwrap().to_owned();
             if name == "dev" {
                 dev_mode = true
             }
+            if name == "warn_default_encoding" {
+                warn_default_encoding = true
+            }
             let value = parts.next().map(ToOwned::to_owned);
             (name, value)
         }));
     }
     settings.dev_mode = dev_mode;
+    if warn_default_encoding
+        || (!ignore_environment && env::var_os("PYTHONWARNDEFAULTENCODING").is_some())
+    {
+        settings.warn_default_encoding = true;
+    }
 
     if dev_mode {
         settings.warnopts.push("default".to_owned())
diff --git a/vm/src/stdlib/sys.rs b/vm/src/stdlib/sys.rs
@@ -603,6 +603,8 @@ mod sys {
         dev_mode: bool,
         /// -X utf8
         utf8_mode: u8,
+        /// -X warn_default_encoding, PYTHONWARNDEFAULTENCODING
+        warn_default_encoding: u8,
     }
 
     #[pyimpl(with(PyStructSequence))]
@@ -624,6 +626,7 @@ mod sys {
                 isolated: settings.isolated as u8,
                 dev_mode: settings.dev_mode,
                 utf8_mode: 1,
+                warn_default_encoding: settings.warn_default_encoding as u8,
             }
         }
 
diff --git a/vm/src/vm/setting.rs b/vm/src/vm/setting.rs
@@ -43,6 +43,9 @@ pub struct Settings {
     /// -Xdev
     pub dev_mode: bool,
 
+    /// -X warn_default_encoding, PYTHONWARNDEFAULTENCODING
+    pub warn_default_encoding: bool,
+
     /// -Wfoo
     pub warnopts: Vec<String>,
 
@@ -78,6 +81,7 @@ impl Default for Settings {
             xopts: vec![],
             isolated: false,
             dev_mode: false,
+            warn_default_encoding: false,
             warnopts: vec![],
             path_list: vec![
                 #[cfg(all(feature = "pylib", not(feature = "freeze-stdlib")))]

Original file line number	Diff line number	Diff line change
`@@ -603,6 +603,8 @@ mod sys {`
`603`	`603`	`dev_mode: bool,`
`604`	`604`	`/// -X utf8`
`605`	`605`	`utf8_mode: u8,`
	`606`	`+ /// -X warn_default_encoding, PYTHONWARNDEFAULTENCODING`
	`607`	`+ warn_default_encoding: u8,`
`606`	`608`	`}`
`607`	`609`
`608`	`610`	`#[pyimpl(with(PyStructSequence))]`
`@@ -624,6 +626,7 @@ mod sys {`
`624`	`626`	`isolated: settings.isolated as u8,`
`625`	`627`	`dev_mode: settings.dev_mode,`
`626`	`628`	`utf8_mode: 1,`
	`629`	`+ warn_default_encoding: settings.warn_default_encoding as u8,`
`627`	`630`	`}`
`628`	`631`	`}`
`629`	`632`