Author: Brian Kearns <bdkea...@gmail.com> Branch: use-file-star-for-file Changeset: r73409:fc2acceb8c60 Date: 2014-09-09 21:00 -0400 http://bitbucket.org/pypy/pypy/changeset/fc2acceb8c60/
Log: merge default diff --git a/pypy/doc/release-2.4.0.rst b/pypy/doc/release-2.4.0.rst --- a/pypy/doc/release-2.4.0.rst +++ b/pypy/doc/release-2.4.0.rst @@ -7,10 +7,6 @@ You can already download the PyPy 2.4-beta1 pre-release here: - https://bitbucket.org/pypy/pypy/downloads - -It should also soon be available on: - http://pypy.org/download.html We would like to thank our donors for the continued support of the PyPy @@ -87,7 +83,7 @@ this mostly affects errno handling on linux, which makes external calls faster. -* Move to a mixed polling and mutex GIL model that make mutli-threaded jitted +* Move to a mixed polling and mutex GIL model that make mutlithreaded jitted code run *much* faster * Optimize errno handling in linux (x86 and x86-64 only) @@ -111,7 +107,7 @@ .. _resolved: https://bitbucket.org/pypy/pypy/issues?status=resolved We have further improvements on the way: rpython file handling, -numpy linalg compatability, as well +numpy linalg compatibility, as well as improved GC and many smaller improvements. Please try it out and let us know what you think. We especially welcome diff --git a/rpython/rlib/rfile.py b/rpython/rlib/rfile.py --- a/rpython/rlib/rfile.py +++ b/rpython/rlib/rfile.py @@ -220,6 +220,9 @@ do_close = self._close2[1] do_close(ll_file) # return value ignored + def _cleanup_(self): + self._ll_file = lltype.nullptr(FILEP.TO) + def close(self): """Closes the described file. @@ -481,3 +484,7 @@ def fileno(self): self._check_closed() return intmask(c_fileno(self._ll_file)) + + def isatty(self): + self._check_closed() + return os.isatty(c_fileno(self._ll_file)) diff --git a/rpython/rlib/test/test_rfile.py b/rpython/rlib/test/test_rfile.py --- a/rpython/rlib/test/test_rfile.py +++ b/rpython/rlib/test/test_rfile.py @@ -279,6 +279,7 @@ def f(): f = open(fname, "w") + assert not f.isatty() try: return f.fileno() finally: diff --git a/rpython/translator/platform/windows.py b/rpython/translator/platform/windows.py --- a/rpython/translator/platform/windows.py +++ b/rpython/translator/platform/windows.py @@ -100,8 +100,8 @@ cc = 'cl.exe' link = 'link.exe' - cflags = ('/MD', '/O2') - link_flags = () + cflags = ('/MD', '/O2', '/Zi') + link_flags = ('/debug',) standalone_only = () shared_only = () environ = None @@ -143,7 +143,6 @@ # Install debug options only when interpreter is in debug mode if sys.executable.lower().endswith('_d.exe'): self.cflags = ['/MDd', '/Z7', '/Od'] - self.link_flags = ['/debug'] # Increase stack size, for the linker and the stack check code. stack_size = 8 << 20 # 8 Mb _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
