Author: mattip <matti.pi...@gmail.com> Branch: Changeset: r75910:427ccadfbbd6 Date: 2015-02-16 08:04 +0200 http://bitbucket.org/pypy/pypy/changeset/427ccadfbbd6/
Log: fix failing whatsnew-head and test_version tests diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head.rst @@ -6,8 +6,8 @@ .. startrev: 397b96217b85 -Fix non-blocking file reads sometimes raising EAGAIN even though they -have buffered data waiting (b1c4fcb04a42) +Non-blocking file reads sometimes raised EAGAIN even though they +had buffered data waiting, fixed in b1c4fcb04a42 .. branch: vmprof @@ -18,3 +18,8 @@ .. branch: stdlib-2.7.9 Update stdlib to version 2.7.9 + +.. branch: fix-kqueue-error2 +Fix exception being raised by kqueue.control (CPython compatibility) + +.. branch: gitignore diff --git a/pypy/module/cpyext/include/patchlevel.h b/pypy/module/cpyext/include/patchlevel.h --- a/pypy/module/cpyext/include/patchlevel.h +++ b/pypy/module/cpyext/include/patchlevel.h @@ -29,7 +29,7 @@ #define PY_VERSION "2.7.9" /* PyPy version as a string */ -#define PYPY_VERSION "2.6.0" +#define PYPY_VERSION "2.6.0-alpha0" /* Subversion Revision number of this file (not of the repository). * Empty since Mercurial migration. */ _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
