Author: andrewjlawrence
Branch: winconsoleio
Changeset: r97559:162b9ddd10a3
Date: 2019-09-20 07:11 +0100
http://bitbucket.org/pypy/pypy/changeset/162b9ddd10a3/

Log:    Removed extraneous frees

diff --git a/pypy/module/_io/interp_win32consoleio.py 
b/pypy/module/_io/interp_win32consoleio.py
--- a/pypy/module/_io/interp_win32consoleio.py
+++ b/pypy/module/_io/interp_win32consoleio.py
@@ -521,7 +521,6 @@
                 return err_mode(space,"writing")
             
             if not len(buffer):
-                lltype.free(n, flavor='raw')
                 return space.newint(0)
             
             if len(buffer) > BUFMAX:
@@ -536,7 +535,6 @@
                 wlen = rwin32.MultiByteToWideChar(rwin32.CP_UTF8, 0 , buffer, 
buflen, rffi.NULL, 0)
             
             if not wlen:
-                lltype.free(n, flavor='raw')
                 raise WindowsError("Failed to convert bytes to wide 
characters")
         
             with lltype.scoped_alloc(rffi.CWCHARP.TO, wlen) as wbuf:
diff --git a/pypy/module/_io/test/test_win32consoleio.py 
b/pypy/module/_io/test/test_win32consoleio.py
--- a/pypy/module/_io/test/test_win32consoleio.py
+++ b/pypy/module/_io/test/test_win32consoleio.py
@@ -12,7 +12,7 @@
     def test_open_fd(self):
         import _io
 
-        w_fd = self.fileno()
+        w_fd = self.tempfile.fileno()
         # Windows 10: "Cannot open non-console file"
         # Earlier: "Cannot open console output buffer for reading"
         raises(ValueError, _io._WindowsConsoleIO, fd)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to