Merge branch 'master' of https://github.com/RustPython/RustPython

coolreader18 · coolreader18 · commit d6d305f4a451 · 2019-09-26T11:06:23.000-05:00
diff --git a/tests/snippets/basic_types.py b/tests/snippets/basic_types.py
@@ -1,3 +1,6 @@
+from testutils import assert_raises
+
+
 # Spec: https://docs.python.org/2/library/types.html
 print(None)
 # TypeType
@@ -36,6 +39,9 @@
 except TypeError:
     pass
 
+with assert_raises(ValueError):
+    bytes(-1)
+
 a = bytearray([1, 2, 3])
 # assert a[1] == 2
 
diff --git a/tests/snippets/exit.py b/tests/snippets/exit.py
@@ -0,0 +1,4 @@
+from testutils import assert_raises
+
+with assert_raises(SystemExit):
+    exit()
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -883,6 +883,7 @@ pub fn make_module(vm: &VirtualMachine, module: PyObjectRef) {
         "UserWarning" => ctx.exceptions.user_warning.clone(),
 
         "KeyboardInterrupt" => ctx.exceptions.keyboard_interrupt.clone(),
+        "SystemExit" => ctx.exceptions.system_exit.clone(),
     });
 }
 
diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs
@@ -252,6 +252,7 @@ pub struct ExceptionZoo {
     pub user_warning: PyClassRef,
 
     pub keyboard_interrupt: PyClassRef,
+    pub system_exit: PyClassRef,
 }
 
 impl ExceptionZoo {
@@ -303,6 +304,7 @@ impl ExceptionZoo {
         let user_warning = create_type("UserWarning", &type_type, &warning);
 
         let keyboard_interrupt = create_type("KeyboardInterrupt", &type_type, &base_exception_type);
+        let system_exit = create_type("SystemExit", &type_type, &base_exception_type);
 
         ExceptionZoo {
             arithmetic_error,
@@ -347,6 +349,7 @@ impl ExceptionZoo {
             reference_error,
             user_warning,
             keyboard_interrupt,
+            system_exit,
         }
     }
 }
diff --git a/vm/src/obj/objbyteinner.rs b/vm/src/obj/objbyteinner.rs
@@ -117,7 +117,9 @@ impl ByteInnerNewOptions {
             let value = if let OptionalArg::Present(ival) = self.val_option {
                 match_class!(match ival.clone() {
                     i @ PyInt => {
-                        let size = objint::get_value(&i.into_object()).to_usize().unwrap();
+                        let size = objint::get_value(&i.into_object())
+                            .to_usize()
+                            .ok_or_else(|| vm.new_value_error("negative count".to_string()))?;
                         Ok(vec![0; size])
                     }
                     _l @ PyString => {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +from testutils import assert_raises
++
 +with assert_raises(SystemExit):
 +    exit()
Original file line number	Diff line number	Diff line change
`@@ -883,6 +883,7 @@ pub fn make_module(vm: &VirtualMachine, module: PyObjectRef) {`
`883`	`883`	`"UserWarning" => ctx.exceptions.user_warning.clone(),`
`884`	`884`
`885`	`885`	`"KeyboardInterrupt" => ctx.exceptions.keyboard_interrupt.clone(),`
	`886`	`+ "SystemExit" => ctx.exceptions.system_exit.clone(),`
`886`	`887`	`});`
`887`	`888`	`}`
`888`	`889`
Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,7 @@ pub struct ExceptionZoo {`
`252`	`252`	`pub user_warning: PyClassRef,`
`253`	`253`
`254`	`254`	`pub keyboard_interrupt: PyClassRef,`
	`255`	`+ pub system_exit: PyClassRef,`
`255`	`256`	`}`
`256`	`257`
`257`	`258`	`impl ExceptionZoo {`
`@@ -303,6 +304,7 @@ impl ExceptionZoo {`
`303`	`304`	`let user_warning = create_type("UserWarning", &type_type, &warning);`
`304`	`305`
`305`	`306`	`let keyboard_interrupt = create_type("KeyboardInterrupt", &type_type, &base_exception_type);`
	`307`	`+ let system_exit = create_type("SystemExit", &type_type, &base_exception_type);`
`306`	`308`
`307`	`309`	`ExceptionZoo {`
`308`	`310`	`arithmetic_error,`
`@@ -347,6 +349,7 @@ impl ExceptionZoo {`
`347`	`349`	`reference_error,`
`348`	`350`	`user_warning,`
`349`	`351`	`keyboard_interrupt,`
	`352`	`+ system_exit,`
`350`	`353`	`}`
`351`	`354`	`}`
`352`	`355`	`}`