Skip to content

Fix bz2 module #5605

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

Closed
arihant2math wants to merge 10 commits into from
Closed

Fix bz2 module #5605

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
51a3bf1
fix bz2 module
arihant2math Mar 13, 2025
2932965
formatting
arihant2math Mar 13, 2025
4e42718
Fix a test
arihant2math Mar 13, 2025
fecd886
clippy fix
arihant2math Mar 24, 2025
1456313
try and fix some stuff
arihant2math Apr 1, 2025
ba20807
fix test_bz2
arihant2math Apr 15, 2025
3076f32
fix test_codecs
arihant2math Apr 15, 2025
c52396e
fix test_tarfile
arihant2math Apr 15, 2025
afbb3fe
formatting
arihant2math Apr 15, 2025
3b77b42
fix test_bz2
arihant2math Apr 15, 2025
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
Prev Previous commit
Next Next commit
formatting
  • Loading branch information
@arihant2math
arihant2math committed Apr 15, 2025
commit 2932965b337fdc5976f27b7613e9de55005766c7
25 changes: 10 additions & 15 deletions stdlib/src/bz2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ pub(crate) use _bz2::make_module;
mod _bz2 {
use crate::common::lock::PyMutex;
use crate::vm::{
FromArgs,
VirtualMachine,
FromArgs, VirtualMachine,
builtins::{PyBytesRef, PyTypeRef},
function::{ArgBytesLike, OptionalArg},
object::{PyPayload, PyResult},
Expand All @@ -26,7 +25,7 @@ mod _bz2 {
eof: bool,
// Unused data found after the end of stream.
unused_data: Option<Vec<u8>>,
needs_input: bool
needs_input: bool,
}

#[pyattr]
Expand All @@ -51,7 +50,7 @@ mod _bz2 {
eof: false,
input_buffer: Vec::new(),
unused_data: None,
needs_input: true
needs_input: true,
}),
}
.into_ref_with_type(vm, cls)
Expand All @@ -70,11 +69,7 @@ mod _bz2 {
#[pyclass(with(Constructor))]
impl BZ2Decompressor {
#[pymethod]
fn decompress(
&self,
args: DecompressArgs,
vm: &VirtualMachine,
) -> PyResult<PyBytesRef> {
fn decompress(&self, args: DecompressArgs, vm: &VirtualMachine) -> PyResult<PyBytesRef> {
let DecompressArgs { data, max_length } = args;
let DecompressorState {
eof,
Expand All @@ -94,13 +89,13 @@ mod _bz2 {
// If max_length is nonnegative, read at most that many bytes.
if max_length >= 0 {
let mut limited = decoder.by_ref().take(max_length as u64);
limited.read_to_end(&mut output).map_err(|e| {
vm.new_os_error(format!("Decompression error: {}", e))
})?;
limited
.read_to_end(&mut output)
.map_err(|e| vm.new_os_error(format!("Decompression error: {}", e)))?;
} else {
decoder.read_to_end(&mut output).map_err(|e| {
vm.new_os_error(format!("Decompression error: {}", e))
})?;
decoder
.read_to_end(&mut output)
.map_err(|e| vm.new_os_error(format!("Decompression error: {}", e)))?;
}

// Determine how many bytes were consumed from the input.
Expand Down