Skip to content

Fix padding direction in str.ljust and str.rjust #3504

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
chrisnovakovic merged 1 commit into from
Mar 23, 2026
+12 −12
Merged

Fix padding direction in str.ljust and str.rjust #3504

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions docs/lexicon.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ <h3 class="title-3">
><span class="fn-arg">width</span>[,
<span class="fn-arg">fillchar</span>]<span class="fn-p">)</span></code
>
- returns a copy of this string left-padded with the character given
- returns a copy of this string right-padded with the character given
in <code class="code">fillchar</code> (or the default <code class="code"
>' '</code> if no value is given) until it is <code class="code"
>width</code> characters long.
Expand All @@ -431,7 +431,7 @@ <h3 class="title-3">
><span class="fn-arg">width</span>[,
<span class="fn-arg">fillchar</span>]<span class="fn-p">)</span></code
>
- returns a copy of this string right-padded with the character given
- returns a copy of this string left-padded with the character given
in <code class="code">fillchar</code> (or the default <code class="code"
>' '</code> if no value is given) until it is <code class="code"
>width</code> characters long.
Expand Down
4 changes: 2 additions & 2 deletions src/parse/asp/builtins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,9 +569,9 @@ func strJust(s *scope, args []pyObject, left bool) pyObject {
return pyString(self)
}
if left {
return pyString(strings.Repeat(fillchar, count) + self)
return pyString(self + strings.Repeat(fillchar, count))
}
return pyString(self + strings.Repeat(fillchar, count))
return pyString(strings.Repeat(fillchar, count) + self)
}

func strLStrip(s *scope, args []pyObject) pyObject {
Expand Down
16 changes: 8 additions & 8 deletions src/parse/asp/interpreter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,16 +734,16 @@ func TestBreakLoop(t *testing.T) {
func TestStrLjust(t *testing.T) {
s, err := parseFile("src/parse/asp/test_data/interpreter/str/ljust.build")
assert.NoError(t, err)
assert.EqualValues(t, pyString(" kittens"), s.Lookup("s1"))
assert.EqualValues(t, pyString("+++kittens"), s.Lookup("s2"))
assert.EqualValues(t, pyString("kittens "), s.Lookup("s1"))
assert.EqualValues(t, pyString("kittens+++"), s.Lookup("s2"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s3"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s4"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s5"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s6"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s7"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s8"))
assert.EqualValues(t, pyString("£££kittens"), s.Lookup("s9"))
assert.EqualValues(t, pyString("++++££kittens££"), s.Lookup("s10"))
assert.EqualValues(t, pyString("kittens£££"), s.Lookup("s9"))
assert.EqualValues(t, pyString("££kittens££++++"), s.Lookup("s10"))
// Make sure the original string wasn't modified:
assert.EqualValues(t, pyString("kittens"), s.Lookup("orig"))

Expand All @@ -754,16 +754,16 @@ func TestStrLjust(t *testing.T) {
func TestStrRjust(t *testing.T) {
s, err := parseFile("src/parse/asp/test_data/interpreter/str/rjust.build")
assert.NoError(t, err)
assert.EqualValues(t, pyString("kittens "), s.Lookup("s1"))
assert.EqualValues(t, pyString("kittens+++"), s.Lookup("s2"))
assert.EqualValues(t, pyString(" kittens"), s.Lookup("s1"))
assert.EqualValues(t, pyString("+++kittens"), s.Lookup("s2"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s3"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s4"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s5"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s6"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s7"))
assert.EqualValues(t, pyString("kittens"), s.Lookup("s8"))
assert.EqualValues(t, pyString("kittens£££"), s.Lookup("s9"))
assert.EqualValues(t, pyString("££kittens££++++"), s.Lookup("s10"))
assert.EqualValues(t, pyString("£££kittens"), s.Lookup("s9"))
assert.EqualValues(t, pyString("++++££kittens££"), s.Lookup("s10"))
// Make sure the original string wasn't modified:
assert.EqualValues(t, pyString("kittens"), s.Lookup("orig"))

Expand Down
Loading