FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

warning module start by youknowone · Pull Request #3736 · RustPython/RustPython · GitHub

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .rs  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
1 change: 1 addition & 0 deletions vm/src/lib.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ pub mod types;
pub mod utils;
pub mod version;
pub mod vm;
pub mod warn;

pub use self::convert::{TryFromBorrowedObject, TryFromObject};
pub use self::object::{
Expand Down
31 changes: 8 additions & 23 deletions vm/src/stdlib/warnings.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ mod _warnings {
use crate::{
builtins::{PyStrRef, PyTypeRef},
function::OptionalArg,
stdlib::sys::PyStderr,
AsObject, PyResult, VirtualMachine,
PyResult, VirtualMachine,
};

#[derive(FromArgs)]
Expand All @@ -38,27 +37,13 @@ mod _warnings {

#[pyfunction]
fn warn(args: WarnArgs, vm: &VirtualMachine) -> PyResult<()> {
// TODO: Implement correctly
let level = args.stacklevel.unwrap_or(1);
let category = if let OptionalArg::Present(category) = args.category {
if !category.fast_issubclass(vm.ctx.exceptions.warning) {
return Err(vm.new_type_error(format!(
"category must be a Warning subclass, not '{}'",
category.class().name()
)));
}
category
} else {
vm.ctx.exceptions.user_warning.to_owned()
};
let stderr = PyStderr(vm);
writeln!(
stderr,
"level:{}: {}: {}",
level,
category.name(),
args.message
);
Ok(())
crate::warn::warn(
args.message,
args.category.into_option(),
level as isize,
None,
vm,
)
}
}
118 changes: 118 additions & 0 deletions vm/src/warn.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
use crate::{
builtins::{PyDict, PyStrRef, PyType, PyTypeRef},
AsObject, Py, PyObjectRef, PyResult, VirtualMachine,
};

pub fn py_warn(
category: &Py<PyType>,
message: String,
stack_level: usize,
vm: &VirtualMachine,
) -> PyResult<()> {
// TODO: use rust warnings module
if let Ok(module) = vm.import("warnings", None, 0) {
if let Ok(func) = module.get_attr("warn", vm) {
let _ = vm.invoke(&func, (message, category.to_owned(), stack_level));
}
}
Ok(())
}

pub fn warn(
message: PyStrRef,
category: Option<PyTypeRef>,
stack_level: isize,
source: Option<PyObjectRef>,
vm: &VirtualMachine,
) -> PyResult<()> {
let (filename, lineno, module, registry) = setup_context(stack_level, vm)?;
warn_explicit(
category, message, filename, lineno, module, registry, None, source, vm,
)
}

#[allow(clippy::too_many_arguments)]
fn warn_explicit(
category: Option<PyTypeRef>,
message: PyStrRef,
_filename: PyStrRef,
_lineno: usize,
_module: PyObjectRef,
_registry: PyObjectRef,
_source_line: Option<PyObjectRef>,
_source: Option<PyObjectRef>,
vm: &VirtualMachine,
) -> PyResult<()> {
// TODO: Implement correctly
let category = if let Some(category) = category {
if !category.fast_issubclass(vm.ctx.exceptions.warning) {
return Err(vm.new_type_error(format!(
"category must be a Warning subclass, not '{}'",
category.class().name()
)));
}
category
} else {
vm.ctx.exceptions.user_warning.to_owned()
};
let stderr = crate::stdlib::sys::PyStderr(vm);
writeln!(stderr, "{}: {}", category.name(), message.as_str(),);
Ok(())
}

// filename, module, and registry are new refs, globals is borrowed
// Returns 0 on error (no new refs), 1 on success
fn setup_context(
_stack_level: isize,
vm: &VirtualMachine,
) -> PyResult<
// filename, lineno, module, registry
(PyStrRef, usize, PyObjectRef, PyObjectRef),
> {
let __warningregistry__ = "__warningregistry__";
let __name__ = "__name__";

// Setup globals, filename and lineno.
let frame = vm.current_frame();

// PyThreadState *tstate = _PyThreadState_GET();
// PyFrameObject *f = PyThreadState_GetFrame(tstate);
// // Stack level comparisons to Python code is off by one as there is no
// // warnings-related stack level to avoid.
// if (stack_level <= 0 || is_internal_frame(f)) {
// while (--stack_level > 0 && f != NULL) {
// PyFrameObject *back = PyFrame_GetBack(f);
// Py_DECREF(f);
// f = back;
// }
// }
// else {
// while (--stack_level > 0 && f != NULL) {
// f = next_external_frame(f);
// }
// }

let (globals, filename, lineno) = if let Some(f) = frame {
// TODO:
let lineno = 1;
// *lineno = PyFrame_GetLineNumber(f);
// *filename = code->co_filename;
(f.globals.clone(), f.code.source_path, lineno)
} else {
(vm.current_globals().clone(), vm.ctx.intern_str("sys"), 1)
};

let registry = if let Ok(registry) = globals.get_item(__warningregistry__, vm) {
registry
} else {
let registry = PyDict::new_ref(&vm.ctx);
globals.set_item(__warningregistry__, registry.clone().into(), vm)?;
registry.into()
};

// Setup module.
let module = globals
.get_item(__name__, vm)
.unwrap_or_else(|_| vm.new_pyobj("<string>"));
Ok((filename.to_owned(), lineno, module, registry))
}

Back | FazBrowse Home | New Git URL