2019-03-29 22:11:32 +00:00
|
|
|
use pyo3::class::PySequenceProtocol;
|
2020-07-04 15:55:26 +00:00
|
|
|
use pyo3::exceptions::{PyIndexError, PyValueError};
|
2019-03-29 22:11:32 +00:00
|
|
|
use pyo3::prelude::*;
|
2020-03-18 04:31:22 +00:00
|
|
|
use pyo3::types::{IntoPyDict, PyList};
|
2019-03-29 22:11:32 +00:00
|
|
|
|
2020-05-17 10:45:42 +00:00
|
|
|
use pyo3::py_run;
|
|
|
|
|
|
|
|
mod common;
|
|
|
|
|
2019-03-29 22:11:32 +00:00
|
|
|
#[pyclass]
|
|
|
|
struct ByteSequence {
|
|
|
|
elements: Vec<u8>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[pymethods]
|
|
|
|
impl ByteSequence {
|
|
|
|
#[new]
|
2019-12-14 14:16:39 +00:00
|
|
|
fn new(elements: Option<&PyList>) -> PyResult<Self> {
|
2019-03-31 03:25:02 +00:00
|
|
|
if let Some(pylist) = elements {
|
2019-03-29 22:11:32 +00:00
|
|
|
let mut elems = Vec::with_capacity(pylist.len());
|
|
|
|
for pyelem in pylist.into_iter() {
|
|
|
|
let elem = u8::extract(pyelem)?;
|
|
|
|
elems.push(elem);
|
|
|
|
}
|
2019-12-14 14:16:39 +00:00
|
|
|
Ok(Self { elements: elems })
|
2019-03-29 22:11:32 +00:00
|
|
|
} else {
|
2019-12-14 14:16:39 +00:00
|
|
|
Ok(Self {
|
2019-03-29 22:17:07 +00:00
|
|
|
elements: Vec::new(),
|
2019-12-14 14:16:39 +00:00
|
|
|
})
|
2019-03-31 03:25:02 +00:00
|
|
|
}
|
2019-03-29 22:11:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[pyproto]
|
|
|
|
impl PySequenceProtocol for ByteSequence {
|
2020-06-23 10:40:17 +00:00
|
|
|
fn __len__(&self) -> usize {
|
|
|
|
self.elements.len()
|
2019-03-29 22:11:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn __getitem__(&self, idx: isize) -> PyResult<u8> {
|
2019-03-29 22:17:07 +00:00
|
|
|
self.elements
|
|
|
|
.get(idx as usize)
|
2019-08-17 12:10:36 +00:00
|
|
|
.copied()
|
2020-08-25 19:33:36 +00:00
|
|
|
.ok_or_else(|| PyIndexError::new_err("list index out of range"))
|
2019-03-29 22:11:32 +00:00
|
|
|
}
|
|
|
|
|
2020-06-23 10:40:17 +00:00
|
|
|
fn __setitem__(&mut self, idx: isize, value: u8) {
|
2019-03-29 22:11:32 +00:00
|
|
|
self.elements[idx as usize] = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
fn __delitem__(&mut self, idx: isize) -> PyResult<()> {
|
|
|
|
if (idx < self.elements.len() as isize) && (idx >= 0) {
|
|
|
|
self.elements.remove(idx as usize);
|
|
|
|
Ok(())
|
|
|
|
} else {
|
2020-08-25 19:33:36 +00:00
|
|
|
Err(PyIndexError::new_err("list index out of range"))
|
2019-03-29 22:11:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-23 10:40:17 +00:00
|
|
|
fn __contains__(&self, other: &PyAny) -> bool {
|
2019-03-29 22:11:32 +00:00
|
|
|
match u8::extract(other) {
|
2020-11-12 11:09:24 +00:00
|
|
|
Ok(x) => self.elements.contains(&x),
|
2020-06-23 10:40:17 +00:00
|
|
|
Err(_) => false,
|
2019-03-29 22:11:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-23 10:40:17 +00:00
|
|
|
fn __concat__(&self, other: PyRef<'p, Self>) -> Self {
|
2019-03-29 22:11:32 +00:00
|
|
|
let mut elements = self.elements.clone();
|
|
|
|
elements.extend_from_slice(&other.elements);
|
2020-06-23 10:40:17 +00:00
|
|
|
Self { elements }
|
2019-03-29 22:11:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn __repeat__(&self, count: isize) -> PyResult<Self> {
|
|
|
|
if count >= 0 {
|
|
|
|
let mut elements = Vec::with_capacity(self.elements.len() * count as usize);
|
|
|
|
for _ in 0..count {
|
|
|
|
elements.extend(&self.elements);
|
|
|
|
}
|
|
|
|
Ok(Self { elements })
|
|
|
|
} else {
|
2020-08-25 19:33:36 +00:00
|
|
|
Err(PyValueError::new_err("invalid repeat count"))
|
2019-03-29 22:11:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_getitem() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
let d = [("ByteSequence", py.get_type::<ByteSequence>())].into_py_dict(py);
|
|
|
|
|
|
|
|
let run = |code| py.run(code, None, Some(d)).unwrap();
|
|
|
|
let err = |code| py.run(code, None, Some(d)).unwrap_err();
|
|
|
|
|
|
|
|
run("s = ByteSequence([1, 2, 3]); assert s[0] == 1");
|
|
|
|
run("s = ByteSequence([1, 2, 3]); assert s[1] == 2");
|
|
|
|
run("s = ByteSequence([1, 2, 3]); assert s[2] == 3");
|
|
|
|
err("s = ByteSequence([1, 2, 3]); print(s[-4])");
|
|
|
|
err("s = ByteSequence([1, 2, 3]); print(s[4])");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_setitem() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
let d = [("ByteSequence", py.get_type::<ByteSequence>())].into_py_dict(py);
|
|
|
|
|
|
|
|
let run = |code| py.run(code, None, Some(d)).unwrap();
|
|
|
|
let err = |code| py.run(code, None, Some(d)).unwrap_err();
|
|
|
|
|
|
|
|
run("s = ByteSequence([1, 2, 3]); s[0] = 4; assert list(s) == [4, 2, 3]");
|
|
|
|
err("s = ByteSequence([1, 2, 3]); s[0] = 'hello'");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_delitem() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
|
|
|
|
let d = [("ByteSequence", py.get_type::<ByteSequence>())].into_py_dict(py);
|
|
|
|
let run = |code| py.run(code, None, Some(d)).unwrap();
|
|
|
|
let err = |code| py.run(code, None, Some(d)).unwrap_err();
|
|
|
|
|
|
|
|
run("s = ByteSequence([1, 2, 3]); del s[0]; assert list(s) == [2, 3]");
|
|
|
|
run("s = ByteSequence([1, 2, 3]); del s[1]; assert list(s) == [1, 3]");
|
|
|
|
run("s = ByteSequence([1, 2, 3]); del s[-1]; assert list(s) == [1, 2]");
|
|
|
|
run("s = ByteSequence([1, 2, 3]); del s[-2]; assert list(s) == [1, 3]");
|
|
|
|
err("s = ByteSequence([1, 2, 3]); del s[-4]; print(list(s))");
|
|
|
|
err("s = ByteSequence([1, 2, 3]); del s[4]");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_contains() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
|
|
|
|
let d = [("ByteSequence", py.get_type::<ByteSequence>())].into_py_dict(py);
|
|
|
|
let run = |code| py.run(code, None, Some(d)).unwrap();
|
|
|
|
|
|
|
|
run("s = ByteSequence([1, 2, 3]); assert 1 in s");
|
|
|
|
run("s = ByteSequence([1, 2, 3]); assert 2 in s");
|
|
|
|
run("s = ByteSequence([1, 2, 3]); assert 3 in s");
|
|
|
|
run("s = ByteSequence([1, 2, 3]); assert 4 not in s");
|
|
|
|
run("s = ByteSequence([1, 2, 3]); assert 'hello' not in s");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_concat() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
|
|
|
|
let d = [("ByteSequence", py.get_type::<ByteSequence>())].into_py_dict(py);
|
|
|
|
let run = |code| py.run(code, None, Some(d)).unwrap();
|
|
|
|
let err = |code| py.run(code, None, Some(d)).unwrap_err();
|
|
|
|
|
|
|
|
run("s1 = ByteSequence([1, 2]); s2 = ByteSequence([3, 4]); assert list(s1+s2) == [1, 2, 3, 4]");
|
|
|
|
err("s1 = ByteSequence([1, 2]); s2 = 'hello'; s1 + s2");
|
|
|
|
}
|
|
|
|
|
2019-03-31 03:25:02 +00:00
|
|
|
#[test]
|
|
|
|
fn test_inplace_concat() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
|
|
|
|
let d = [("ByteSequence", py.get_type::<ByteSequence>())].into_py_dict(py);
|
|
|
|
let run = |code| py.run(code, None, Some(d)).unwrap();
|
|
|
|
let err = |code| py.run(code, None, Some(d)).unwrap_err();
|
|
|
|
|
|
|
|
run("s = ByteSequence([1, 2]); s += ByteSequence([3, 4]); assert list(s) == [1, 2, 3, 4]");
|
|
|
|
err("s = ByteSequence([1, 2]); s += 'hello'");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_repeat() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
|
|
|
|
let d = [("ByteSequence", py.get_type::<ByteSequence>())].into_py_dict(py);
|
|
|
|
let run = |code| py.run(code, None, Some(d)).unwrap();
|
|
|
|
let err = |code| py.run(code, None, Some(d)).unwrap_err();
|
|
|
|
|
|
|
|
run("s1 = ByteSequence([1, 2, 3]); s2 = s1*2; assert list(s2) == [1, 2, 3, 1, 2, 3]");
|
|
|
|
err("s1 = ByteSequence([1, 2, 3]); s2 = s1*-1; assert list(s2) == [1, 2, 3, 1, 2, 3]");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_inplace_repeat() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
|
|
|
|
let d = [("ByteSequence", py.get_type::<ByteSequence>())].into_py_dict(py);
|
|
|
|
let run = |code| py.run(code, None, Some(d)).unwrap();
|
|
|
|
let err = |code| py.run(code, None, Some(d)).unwrap_err();
|
|
|
|
|
|
|
|
run("s = ByteSequence([1, 2]); s *= 3; assert list(s) == [1, 2, 1, 2, 1, 2]");
|
|
|
|
err("s = ByteSequence([1, 2); s *= -1");
|
|
|
|
}
|
2020-05-17 10:45:42 +00:00
|
|
|
|
|
|
|
// Check that #[pyo3(get, set)] works correctly for Vec<PyObject>
|
|
|
|
|
|
|
|
#[pyclass]
|
|
|
|
struct GenericList {
|
|
|
|
#[pyo3(get, set)]
|
|
|
|
items: Vec<PyObject>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_generic_list_get() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
|
|
|
|
let list: PyObject = GenericList {
|
|
|
|
items: [1, 2, 3].iter().map(|i| i.to_object(py)).collect(),
|
|
|
|
}
|
|
|
|
.into_py(py);
|
|
|
|
|
|
|
|
py_assert!(py, list, "list.items == [1, 2, 3]");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_generic_list_set() {
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
|
|
|
|
let list = PyCell::new(py, GenericList { items: vec![] }).unwrap();
|
|
|
|
|
|
|
|
py_run!(py, list, "list.items = [1, 2, 3]");
|
|
|
|
assert_eq!(
|
|
|
|
list.borrow().items,
|
|
|
|
vec![1.to_object(py), 2.to_object(py), 3.to_object(py)]
|
|
|
|
);
|
|
|
|
}
|
2020-06-23 09:07:16 +00:00
|
|
|
|
|
|
|
#[pyclass]
|
|
|
|
struct OptionList {
|
|
|
|
#[pyo3(get, set)]
|
|
|
|
items: Vec<Option<i64>>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[pyproto]
|
|
|
|
impl PySequenceProtocol for OptionList {
|
|
|
|
fn __getitem__(&self, idx: isize) -> PyResult<Option<i64>> {
|
|
|
|
match self.items.get(idx as usize) {
|
|
|
|
Some(x) => Ok(*x),
|
2020-08-25 19:33:36 +00:00
|
|
|
None => Err(PyIndexError::new_err("Index out of bounds")),
|
2020-06-23 09:07:16 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_option_list_get() {
|
|
|
|
// Regression test for #798
|
|
|
|
let gil = Python::acquire_gil();
|
|
|
|
let py = gil.python();
|
|
|
|
|
|
|
|
let list = PyCell::new(
|
|
|
|
py,
|
|
|
|
OptionList {
|
|
|
|
items: vec![Some(1), None],
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
py_assert!(py, list, "list[0] == 1");
|
|
|
|
py_assert!(py, list, "list[1] == None");
|
2020-07-04 15:55:26 +00:00
|
|
|
py_expect_exception!(py, list, "list[2]", PyIndexError);
|
2020-06-23 09:07:16 +00:00
|
|
|
}
|