pyPrint prints to any filelike having .write()

Author: alanjds

runtime/builtin_types.go

@@ -562,7 +562,7 @@ func builtinPrint(f *Frame, args Args, kwargs KWArgs) (*Object, *BaseException)
 			// to the file descriptor probably
 		}
 	}
-	return nil, pyPrint(f, args, sep, end, file)
+	return nil, pyPrint(f, args, sep, end, file.ToObject())
 }
 
 func builtinRange(f *Frame, args Args, kwargs KWArgs) (*Object, *BaseException) {
@@ -590,7 +590,7 @@ func builtinRawInput(f *Frame, args Args, kwargs KWArgs) (*Object, *BaseExceptio
 	}
 
 	if len(args) == 1 {
-		err := pyPrint(f, args, "", "", Stdout)
+		err := pyPrint(f, args, "", "", Stdout.ToObject())
 		if err != nil {
 			return nil, err
 		}

runtime/core.go

@@ -683,7 +683,7 @@ func Print(f *Frame, args Args, nl bool) *BaseException {
 	} else if len(args) > 0 {
 		end = " "
 	}
-	return pyPrint(f, args, " ", end, Stdout)
+	return pyPrint(f, args, " ", end, Stdout.ToObject())
 }
 
 // Repr returns a string containing a printable representation of o. This is
@@ -1258,29 +1258,38 @@ func hashNotImplemented(f *Frame, o *Object) (*Object, *BaseException) {
 }
 
 // pyPrint encapsulates the logic of the Python print function.
-func pyPrint(f *Frame, args Args, sep, end string, file *File) *BaseException {
+func pyPrint(f *Frame, args Args, sep, end string, filelike *Object) *BaseException {
+	writeFunc, raised := GetAttr(f, filelike, NewStr("write"), nil)
+	if raised != nil {
+		return raised
+	}
+
+	pySep := NewStr(sep)
+	pyEnd := NewStr(end)
+	callArgs := f.MakeArgs(1)
 	for i, arg := range args {
 		if i > 0 {
-			err := file.writeString(sep)
-			if err != nil {
-				return f.RaiseType(IOErrorType, err.Error())
+			callArgs[0] = pySep.ToObject()
+			_, raised := writeFunc.Call(f, callArgs, nil)
+			if raised != nil {
+				return raised
 			}
 		}
 
-		s, raised := ToStr(f, arg)
-		if raised != nil {
-			return raised
+		s, raised_ := ToStr(f, arg)
+		if raised_ != nil {
+			return raised_
 		}
 
-		err := file.writeString(s.Value())
-		if err != nil {
-			return f.RaiseType(IOErrorType, err.Error())
+		callArgs[0] = s.ToObject()
+		if _, raised := writeFunc.Call(f, callArgs, nil); raised != nil {
+			return raised
 		}
 	}
 
-	err := file.writeString(end)
-	if err != nil {
-		return f.RaiseType(IOErrorType, err.Error())
+	callArgs[0] = pyEnd.ToObject()
+	if 	_, raised := writeFunc.Call(f, callArgs, nil); raised != nil {
+		return raised
 	}
 
 	return nil