Fixed tests that were writing strings to binary streams

Author: otethal

graalpython/com.oracle.graal.python.cext/src/object.c

@@ -372,9 +372,9 @@ int PyObject_Print(PyObject* object, FILE* fd, int flags) {
     int f = fileno(fd);
     PyTuple_SetItem(args, 0, PyLong_FromLong(f));
     kwargs = PyDict_New();
-    int buffering = 0;
+    int buffering = 1;
     PyDict_SetItemString(kwargs, "buffering", PyLong_FromLong(buffering));
-    PyDict_SetItemString(kwargs, "mode", polyglot_from_string("wb", SRC_CS));
+    PyDict_SetItemString(kwargs, "mode", polyglot_from_string("w", SRC_CS));
     file = PyObject_Call(openFunc, args, kwargs);
 
     printfunc = UPCALL_CEXT_O(_jls_PyTruffle_GetBuiltin, polyglot_from_string("print", SRC_CS));

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/module/PosixTest.java

@@ -140,17 +140,17 @@ public void lseek() throws IOException {
     @Test
     public void write() throws IOException {
         assertPrints("", open("posix.O_RDWR") +
-                        "posix.write(fd, 'hello')");
+                        "posix.write(fd, b'hello')");
         assertTrue(new String(Files.readAllBytes(tmpfile)).equals("hello"));
     }
 
     @Test
     public void close() throws IOException {
         assertLastLineErrorContains("OSError",
                         open("posix.O_RDWR") +
-                                        "posix.write(fd, 'hello')\n" +
+                                        "posix.write(fd, b'hello')\n" +
                                         "posix.close(fd)\n" +
-                                        "posix.write(fd, 'world')");
+                                        "posix.write(fd, b'world')");
         assertTrue(new String(Files.readAllBytes(tmpfile)).equals("hello"));
     }
 
@@ -179,7 +179,7 @@ public void printToFile() throws IOException {
         assertPrints("", open("posix.O_CREAT") +
                         "import _io\n" +
                         "f = _io.FileIO(fd, mode='w')\n" +
-                        "print('hello', file=f)");
+                        "print('hello', file=_io.TextIOWrapper(f))");
         assertEquals("hello\n", new String(Files.readAllBytes(tmpfile)));
     }
 

graalpython/com.oracle.graal.python.test/src/tests/cpyext/__init__.py

@@ -341,10 +341,7 @@ def create_module(self, name=None):
         code = self.template.format(**fargs)
 
         with open("%s/%s.c" % (__dir__, self.name), "wb", buffering=0) as f:
-            if GRAALPYTHON:
-                f.write(code)
-            else:
-                f.write(bytes(code, 'utf-8'))
+            f.write(bytes(code, 'utf-8'))
 
     def _insert(self, d, name, default_value):
         d[name] = d.get(name, default_value)
@@ -597,10 +594,7 @@ def CPyExtType(name, code, **kwargs):
 
     source_file = "%s/%s.c" % (__dir__, name)
     with open(source_file, "wb", buffering=0) as f:
-        if GRAALPYTHON:
-            f.write(c_source)
-        else:
-            f.write(bytes(c_source, 'utf-8'))
+        f.write(bytes(c_source, 'utf-8'))
 
     # ensure file was really written
     try: