Skip to content

Feature: str.format accepting !r, !s and !a #1027

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 4 commits into from
Jun 10, 2019
Merged

Feature: str.format accepting !r, !s and !a #1027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65d0093
Dont fail on '{!r}'.format(...)
alanjds Jun 9, 2019
e19b674
FormatSpec got a preconversor:FormatPreconversor to handle !r, !s and !a
alanjds Jun 9, 2019
f0a2b4c
Apply the {!r} on str.format calls
alanjds Jun 9, 2019
854bacf
Fix the Rust tests
alanjds Jun 9, 2019
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
Next Next commit
Dont fail on '{!r}'.format(...)
  • Loading branch information
@alanjds
alanjds committed Jun 9, 2019
commit 65d009382213fbdd112679a97446ed3194a5530a
3 changes: 3 additions & 0 deletions tests/snippets/strings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@
assert "{0} {1}".format(2,3) == "2 3"
assert "--{:s>4}--".format(1) == "--sss1--"
assert "{keyword} {0}".format(1, keyword=2) == "2 1"
assert "repr() shows quotes: {!r}; str() doesn't: {!s}".format(
'test1', 'test2'
) == "repr() shows quotes: 'test1'; str() doesn't: test2", 'Output: {!r}, {!s}'.format('test1', 'test2')

assert 'a' < 'b'
assert 'a' <= 'b'
Expand Down
11 changes: 11 additions & 0 deletions vm/src/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,17 @@ impl FormatString {
String::new()
};

// On parts[0] can still be the preconversor (!r, !s, !a)
let parts: Vec<&str> = arg_part .splitn(2, '!').collect();
// before the bang is a keyword or arg index, after the comma is maybe a conversor spec.
let arg_part = parts[0];

let preconversor_spec = if parts.len() > 1 {
parts[1].to_string()
} else {
String::new()
};

if arg_part.is_empty() {
return Ok(FormatPart::AutoSpec(format_spec));
}
Expand Down