RustPython
diff --git a/‎examples/freeze/main.rs
+2-2 b/‎examples/freeze/main.rs
+2-2
diff --git a/‎examples/mini_repl.rs
+2-2 b/‎examples/mini_repl.rs
+2-2
diff --git a/‎src/lib.rs
+4-4 b/‎src/lib.rs
+4-4
diff --git a/‎src/shell.rs
+2-2 b/‎src/shell.rs
+2-2
diff --git a/‎vm/src/coroutine.rs
+2-2 b/‎vm/src/coroutine.rs
+2-2
@@ -13,8 +13,8 @@ fn run(vm: &vm::VirtualMachine) -> vm::PyResult<()> {
 
     let res = vm.run_code_obj(vm.new_code_object(module), scope);
 
-    if let Err(err) = res {
-        vm::exceptions::print_exception(&vm, err);
+    if let Err(exc) = res {
+        vm.print_exception(exc);
     }
 
     Ok(())
 
@@ -76,8 +76,8 @@ def fib(n):
                     scope.globals.set_item("last", output, vm)?;
                 }
             }
-            Err(e) => {
-                vm::exceptions::print_exception(vm, e);
+            Err(exc) => {
+                vm.print_exception(exc);
             }
         }
     }
 
@@ -45,8 +45,8 @@ extern crate log;
 
 use clap::{App, AppSettings, Arg, ArgMatches};
 use rustpython_vm::{
-    builtins::PyInt, compile, exceptions::print_exception, match_class, scope::Scope, sysmodule,
-    InitParameter, Interpreter, ItemProtocol, PyResult, PySettings, TypeProtocol, VirtualMachine,
+    builtins::PyInt, compile, match_class, scope::Scope, sysmodule, InitParameter, Interpreter,
+    ItemProtocol, PyResult, PySettings, TypeProtocol, VirtualMachine,
 };
 
 use std::convert::TryInto;
@@ -141,8 +141,8 @@ where
                     }
                 }
             }
-            Err(err) => {
-                print_exception(vm, err);
+            Err(exc) => {
+                vm.print_exception(exc);
                 1
             }
         };
 
@@ -4,7 +4,7 @@ use rustpython_parser::error::{LexicalErrorType, ParseErrorType};
 use rustpython_vm::readline::{Readline, ReadlineResult};
 use rustpython_vm::{
     compile::{self, CompileError, CompileErrorType},
-    exceptions::{print_exception, PyBaseExceptionRef},
+    exceptions::PyBaseExceptionRef,
     scope::Scope,
     PyResult, TypeProtocol, VirtualMachine,
 };
@@ -129,7 +129,7 @@ pub fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
                 repl.save_history(&repl_history_path).unwrap();
                 return Err(exc);
             }
-            print_exception(vm, exc);
+            vm.print_exception(exc);
         }
     }
     repl.save_history(&repl_history_path).unwrap();
 
@@ -1,5 +1,5 @@
 use crate::builtins::{PyStrRef, PyTypeRef};
-use crate::exceptions::{self, PyBaseExceptionRef};
+use crate::exceptions::PyBaseExceptionRef;
 use crate::frame::{ExecutionResult, FrameRef};
 use crate::VirtualMachine;
 use crate::{PyObjectRef, PyResult, TypeProtocol};
@@ -124,7 +124,7 @@ impl Coro {
         vm: &VirtualMachine,
     ) -> PyResult {
         if self.closed.load() {
-            return Err(exceptions::normalize(exc_type, exc_val, exc_tb, vm)?);
+            return Err(vm.normalize_exception(exc_type, exc_val, exc_tb)?);
         }
         let result = self.run_with_context(vm, |f| f.gen_throw(vm, exc_type, exc_val, exc_tb));
         self.maybe_close(&result);
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ fn run(vm: &vm::VirtualMachine) -> vm::PyResult<()> {`
`13`	`13`
`14`	`14`	`let res = vm.run_code_obj(vm.new_code_object(module), scope);`
`15`	`15`
`16`		`- if let Err(err) = res {`
`17`		`- vm::exceptions::print_exception(&vm, err);`
	`16`	`+ if let Err(exc) = res {`
	`17`	`+ vm.print_exception(exc);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`Ok(())`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ def fib(n):`
`76`	`76`	`scope.globals.set_item("last", output, vm)?;`
`77`	`77`	`}`
`78`	`78`	`}`
`79`		`- Err(e) => {`
`80`		`- vm::exceptions::print_exception(vm, e);`
	`79`	`+ Err(exc) => {`
	`80`	`+ vm.print_exception(exc);`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ extern crate log;`
`45`	`45`
`46`	`46`	`use clap::{App, AppSettings, Arg, ArgMatches};`
`47`	`47`	`use rustpython_vm::{`
`48`		`- builtins::PyInt, compile, exceptions::print_exception, match_class, scope::Scope, sysmodule,`
`49`		`- InitParameter, Interpreter, ItemProtocol, PyResult, PySettings, TypeProtocol, VirtualMachine,`
	`48`	`+ builtins::PyInt, compile, match_class, scope::Scope, sysmodule, InitParameter, Interpreter,`
	`49`	`+ ItemProtocol, PyResult, PySettings, TypeProtocol, VirtualMachine,`
`50`	`50`	`};`
`51`	`51`
`52`	`52`	`use std::convert::TryInto;`
`@@ -141,8 +141,8 @@ where`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`	`}`
`144`		`- Err(err) => {`
`145`		`- print_exception(vm, err);`
	`144`	`+ Err(exc) => {`
	`145`	`+ vm.print_exception(exc);`
`146`	`146`	`1`
`147`	`147`	`}`
`148`	`148`	`};`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ use rustpython_parser::error::{LexicalErrorType, ParseErrorType};`
`4`	`4`	`use rustpython_vm::readline::{Readline, ReadlineResult};`
`5`	`5`	`use rustpython_vm::{`
`6`	`6`	`compile::{self, CompileError, CompileErrorType},`
`7`		`- exceptions::{print_exception, PyBaseExceptionRef},`
	`7`	`+ exceptions::PyBaseExceptionRef,`
`8`	`8`	`scope::Scope,`
`9`	`9`	`PyResult, TypeProtocol, VirtualMachine,`
`10`	`10`	`};`
`@@ -129,7 +129,7 @@ pub fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {`
`129`	`129`	`repl.save_history(&repl_history_path).unwrap();`
`130`	`130`	`return Err(exc);`
`131`	`131`	`}`
`132`		`- print_exception(vm, exc);`
	`132`	`+ vm.print_exception(exc);`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`repl.save_history(&repl_history_path).unwrap();`