Author: Brian Kearns <[email protected]>
Branch: stdlib-2.7.6
Changeset: r69617:82d9312d3319
Date: 2014-03-02 10:32 -0500
http://bitbucket.org/pypy/pypy/changeset/82d9312d3319/
Log: small changes
diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst
--- a/pypy/doc/coding-guide.rst
+++ b/pypy/doc/coding-guide.rst
@@ -588,7 +588,7 @@
Modules visible from application programs are imported from
interpreter or application level files. PyPy reuses almost all python
-modules of CPython's standard library, currently from version 2.7.4. We
+modules of CPython's standard library, currently from version 2.7.6. We
sometimes need to `modify modules`_ and - more often - regression tests
because they rely on implementation details of CPython.
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1547,7 +1547,7 @@
self.wrap("fileno() returned a non-integer")
)
fd = self.int_w(w_fd)
- if fd < 0 or fd > 2147483647:
+ if fd < 0 or fd > INT_MAX:
raise oefmt(self.w_ValueError,
"file descriptor cannot be a negative integer (%d)",
fd)
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
@@ -26,7 +26,7 @@
#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "2.7.4"
+#define PY_VERSION "2.7.6"
/* PyPy version as a string */
#define PYPY_VERSION "2.3.0-alpha0"
diff --git a/pypy/module/select/interp_select.py
b/pypy/module/select/interp_select.py
--- a/pypy/module/select/interp_select.py
+++ b/pypy/module/select/interp_select.py
@@ -49,6 +49,7 @@
# we want to be compatible with cpython and also accept things
# that can be casted to integer (I think)
try:
+ # compute the integer
w_timeout = space.int(w_timeout)
except OperationError:
raise oefmt(space.w_TypeError,
diff --git a/pypy/module/sys/version.py b/pypy/module/sys/version.py
--- a/pypy/module/sys/version.py
+++ b/pypy/module/sys/version.py
@@ -7,7 +7,7 @@
from pypy.interpreter import gateway
#XXX # the release serial 42 is not in range(16)
-CPYTHON_VERSION = (2, 7, 4, "final", 42)
+CPYTHON_VERSION = (2, 7, 6, "final", 42)
#XXX # sync CPYTHON_VERSION with patchlevel.h, package.py
CPYTHON_API_VERSION = 1013 #XXX # sync with include/modsupport.h
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
