Skip to content

Arguments wrapping in zlib functions #3577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2022
Merged

Arguments wrapping in zlib functions #3577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7800853
fix arguments handling of compress and decompress functions
gilteunchoi Mar 13, 2022
600e924
unmark expectedFauilure decorator
gilteunchoi Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Lib/test/test_zlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ def test_speech(self):
x = zlib.compress(HAMLET_SCENE)
self.assertEqual(zlib.decompress(x), HAMLET_SCENE)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_keywords(self):
x = zlib.compress(HAMLET_SCENE, level=3)
self.assertEqual(zlib.decompress(x), HAMLET_SCENE)
Expand Down
39 changes: 27 additions & 12 deletions stdlib/src/zlib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mod zlib {
use crate::common::lock::PyMutex;
use crate::vm::{
builtins::{PyBaseExceptionRef, PyBytes, PyBytesRef, PyIntRef, PyTypeRef},
function::{ArgBytesLike, OptionalArg},
function::{ArgBytesLike, OptionalArg, OptionalOption},
IntoPyRef, PyResult, PyValue, VirtualMachine,
};
use adler32::RollingAdler32 as Adler32;
Expand Down Expand Up @@ -90,14 +90,21 @@ mod zlib {
}
}

#[derive(FromArgs)]
struct PyFuncCompressArgs {
#[pyarg(positional)]
data: ArgBytesLike,
#[pyarg(any, optional)]
level: OptionalOption<i32>,
}

/// Returns a bytes object containing compressed data.
#[pyfunction]
fn compress(
data: ArgBytesLike,
level: OptionalArg<i32>,
vm: &VirtualMachine,
) -> PyResult<PyBytesRef> {
let compression = compression_from_int(level.into_option())
fn compress(args: PyFuncCompressArgs, vm: &VirtualMachine) -> PyResult<PyBytesRef> {
let data = args.data;
let level = args.level;

let compression = compression_from_int(level.flatten())
.ok_or_else(|| new_zlib_error("Bad compression level", vm))?;

let mut encoder = ZlibEncoder::new(Vec::new(), compression);
Expand Down Expand Up @@ -223,14 +230,22 @@ mod zlib {
}
}

/// Returns a bytes object containing the uncompressed data.
#[pyfunction]
fn decompress(
#[derive(FromArgs)]
struct PyFuncDecompressArgs {
#[pyarg(positional)]
data: ArgBytesLike,
#[pyarg(any, optional)]
wbits: OptionalArg<i8>,
#[pyarg(any, optional)]
bufsize: OptionalArg<usize>,
vm: &VirtualMachine,
) -> PyResult<Vec<u8>> {
}

/// Returns a bytes object containing the uncompressed data.
#[pyfunction]
fn decompress(arg: PyFuncDecompressArgs, vm: &VirtualMachine) -> PyResult<Vec<u8>> {
let data = arg.data;
let wbits = arg.wbits;
let bufsize = arg.bufsize;
data.with_ref(|data| {
let bufsize = bufsize.unwrap_or(DEF_BUF_SIZE);

Expand Down