Skip to content
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

TextIOWrapper.reconfigure #5368

Merged
merged 1 commit into from
Jul 28, 2024
Merged

TextIOWrapper.reconfigure #5368

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 35 additions & 13 deletions vm/src/stdlib/io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,17 1868,16 @@ mod _io {

#[derive(FromArgs)]
struct TextIOWrapperArgs {
buffer: PyObjectRef,
#[pyarg(any, default)]
encoding: Option<PyStrRef>,
#[pyarg(any, default)]
errors: Option<PyStrRef>,
#[pyarg(any, default)]
newline: Newlines,
#[pyarg(any, default = "false")]
line_buffering: bool,
#[pyarg(any, default = "false")]
write_through: bool,
newline: Option<Newlines>,
#[pyarg(any, default)]
line_buffering: Option<bool>,
#[pyarg(any, default)]
write_through: Option<bool>,
}

#[derive(Debug, Copy, Clone, Default)]
Expand Down Expand Up @@ -2196,9 2195,13 @@ mod _io {
impl DefaultConstructor for TextIOWrapper {}

impl Initializer for TextIOWrapper {
type Args = TextIOWrapperArgs;
type Args = (PyObjectRef, TextIOWrapperArgs);

fn init(zelf: PyRef<Self>, args: Self::Args, vm: &VirtualMachine) -> PyResult<()> {
fn init(
zelf: PyRef<Self>,
(buffer, args): Self::Args,
vm: &VirtualMachine,
) -> PyResult<()> {
let mut data = zelf.lock_opt(vm)?;
*data = None;

Expand All @@ -2218,8 2221,6 @@ mod _io {
.errors
.unwrap_or_else(|| PyStr::from("strict").into_ref(&vm.ctx));

let buffer = args.buffer;

let has_read1 = vm.get_attribute_opt(buffer.clone(), "read1")?.is_some();
let seekable = vm.call_method(&buffer, "seekable", ())?.try_to_bool(vm)?;

Expand Down Expand Up @@ -2256,9 2257,9 @@ mod _io {
decoder,
encoding,
errors,
newline: args.newline,
line_buffering: args.line_buffering,
write_through: args.write_through,
newline: args.newline.unwrap_or_default(),
line_buffering: args.line_buffering.unwrap_or_default(),
write_through: args.write_through.unwrap_or_default(),
chunk_size: 8192,
seekable,
has_read1,
Expand Down Expand Up @@ -2294,6 2295,27 @@ mod _io {

#[pyclass(with(Constructor, Initializer), flags(BASETYPE))]
impl TextIOWrapper {
#[pymethod]
fn reconfigure(&self, args: TextIOWrapperArgs) {
let mut data = self.data.lock().unwrap();
if let Some(data) = data.as_mut() {
if let Some(encoding) = args.encoding {
data.encoding = encoding;
}
if let Some(errors) = args.errors {
data.errors = errors;
}
if let Some(newline) = args.newline {
data.newline = newline;
}
if let Some(line_buffering) = args.line_buffering {
data.line_buffering = line_buffering;
}
if let Some(write_through) = args.write_through {
data.write_through = write_through;
}
}
}
#[pymethod]
fn seekable(&self, vm: &VirtualMachine) -> PyResult {
let textio = self.lock(vm)?;
Expand Down
Loading