[pypy-svn] commit/pypy: amauryfa: hg merge default

[Bitbucket]

1 new changeset in pypy:

http://bitbucket.org/pypy/pypy/changeset/021b219e0aef/
changeset:   r40117:021b219e0aef
branch:      fast-forward
user:        amauryfa
date:        2010-12-17 19:34:01
summary:     hg merge default
affected #:  17 files (1 byte)

--- a/pypy/module/cpyext/intobject.py	Fri Dec 17 15:15:11 2010 +0100
+++ b/pypy/module/cpyext/intobject.py	Fri Dec 17 19:34:01 2010 +0100
@@ -95,3 +95,4 @@
     if pend:
         pend[0] = rffi.ptradd(str, len(s))
     return space.call_function(space.w_int, w_str, w_base)
+


--- a/pypy/module/sys/version.py	Fri Dec 17 15:15:11 2010 +0100
+++ b/pypy/module/sys/version.py	Fri Dec 17 19:34:01 2010 +0100
@@ -7,7 +7,7 @@
 
 #XXX # the release serial 42 is not in range(16)
 CPYTHON_VERSION            = (2, 7, 0, "final", 42)   #XXX # sync patchlevel.h
-CPYTHON_API_VERSION        = 1012   #XXX # sync with include/modsupport.h
+CPYTHON_API_VERSION        = 1013   #XXX # sync with include/modsupport.h
 
 PYPY_VERSION               = (1, 4, 0, "beta", 0)    #XXX # sync patchlevel.h

Repository URL: https://bitbucket.org/pypy/pypy/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.