Skip to content

Add json output for CPython tests #1834

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
coolreader18 merged 7 commits into from
Apr 4, 2020
Merged

Add json output for CPython tests #1834

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6553bf7
Move varargs information into CodeFlags
coolreader18 Apr 2, 2020
a901323
Separate dict.__new__ to dict.__init__ for OrderedDict
coolreader18 Apr 2, 2020
53a6bc3
Add method.__func__ property
coolreader18 Apr 2, 2020
dd92e90
Add str.__format__
coolreader18 Apr 2, 2020
60d96c4
Fix passing a generator to OrderedDict()
coolreader18 Apr 2, 2020
2453b73
Mark failing test
coolreader18 Apr 2, 2020
f66fde5
Add json output for CPython tests
coolreader18 Apr 2, 2020
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
Add str.__format__
  • Loading branch information
@coolreader18
coolreader18 committed Apr 2, 2020
commit dd92e9036655bebd3ed9cfdedbebe1a3b764a32f
13 changes: 10 additions & 3 deletions vm/src/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ impl FormatSpec {
}
};

self.format_sign_and_align(magnitude_string, sign_str)
self.format_sign_and_align(&magnitude_string, sign_str)
}

pub fn format_int(&self, num: &BigInt) -> Result<String, &'static str> {
Expand Down Expand Up @@ -486,12 +486,19 @@ impl FormatSpec {
},
};

self.format_sign_and_align(magnitude_string, sign_str)
self.format_sign_and_align(&magnitude_string, sign_str)
}

pub fn format_string(&self, s: &str) -> Result<String, &'static str> {
match self.format_type {
Some(FormatType::String) | None => self.format_sign_and_align(s, ""),
_ => Err("Unknown format code for object of type 'str'"),
}
}

fn format_sign_and_align(
&self,
magnitude_string: String,
magnitude_string: &str,
sign_str: &str,
) -> Result<String, &'static str> {
let align = self.align.unwrap_or(FormatAlign::Right);
Expand Down
12 changes: 11 additions & 1 deletion vm/src/obj/objstr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use crate::cformat::{
CFormatPart, CFormatPreconversor, CFormatQuantity, CFormatSpec, CFormatString, CFormatType,
CNumberType,
};
use crate::format::{FormatParseError, FormatPart, FormatPreconversor, FormatString};
use crate::format::{FormatParseError, FormatPart, FormatPreconversor, FormatSpec, FormatString};
use crate::function::{single_or_tuple_any, OptionalArg, PyFuncArgs};
use crate::pyhash;
use crate::pyobject::{
Expand Down Expand Up @@ -727,6 +727,16 @@ impl PyString {
}
}

#[pymethod(name = "__format__")]
fn format_str(&self, spec: PyStringRef, vm: &VirtualMachine) -> PyResult<String> {
match FormatSpec::parse(spec.as_str())
.and_then(|format_spec| format_spec.format_string(&self.value))
{
Ok(string) => Ok(string),
Err(err) => Err(vm.new_value_error(err.to_string())),
}
}

/// Return a titlecased version of the string where words start with an
/// uppercase character and the remaining characters are lowercase.
#[pymethod]
Expand Down