Skip to content

Commit 95c528a

Browse files
committed
fix py.Println()
1 parent 96c1e89 commit 95c528a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

os/os.module.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ func system(self py.Object, args py.Tuple) (py.Object, error) {
192192
if err != nil {
193193
return nil, py.ExceptionNewf(py.OSError, err.Error())
194194
}
195-
code, err := py.Println(self, string(outb))
196-
if code != 0 || err != nil {
195+
ok = py.Println(self, string(outb))
196+
if !ok {
197197
return py.Int(1), nil
198198
}
199199

py/util.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -207,33 +207,33 @@ func loadValue(src Object, data interface{}) error {
207207
}
208208

209209
// Println prints the provided strings to gpython's stdout.
210-
func Println(self Object, args ...string) error {
210+
func Println(self Object, args ...string) bool {
211211
sysModule, err := self.(*Module).Context.GetModule("sys")
212212
if err != nil {
213-
return err
213+
return false
214214
}
215215
stdout := sysModule.Globals["stdout"]
216216
write, err := GetAttrString(stdout, "write")
217217
if err != nil {
218-
return err
218+
return false
219219
}
220220
call, ok := write.(I__call__)
221221
if !ok {
222-
return AssertionError
222+
return false
223223
}
224224
for _, v := range args {
225225
if !strings.Contains(v, "\n") {
226226
v += " "
227227
}
228-
_, err := call(Tuple{String(v)}, nil)
228+
_, err := call.M__call__(Tuple{String(v)}, nil)
229229
if err != nil {
230-
return err
230+
return false
231231
}
232232

233233
}
234-
_, err = Call(write, Tuple{String("\n")}, nil) // newline
234+
_, err = call.M__call__(Tuple{String("\n")}, nil) // newline
235235
if err != nil {
236-
return 1, err
236+
return false
237237
}
238-
return 0, nil
238+
return true
239239
}

0 commit comments

Comments
 (0)