[pypy-commit] pypy disable_merge_different_int_types: (arigo, bivab): cast

bivab noreply at buildbot.pypy.org
Mon Nov 28 16:58:29 CET 2011


Author: David Schneider <david.schneider at picle.org>
Branch: disable_merge_different_int_types
Changeset: r49918:be6b9593a9db
Date: 2011-11-28 16:57 +0100
http://bitbucket.org/pypy/pypy/changeset/be6b9593a9db/

Log:	(arigo, bivab): cast

diff --git a/pypy/module/rctime/interp_time.py b/pypy/module/rctime/interp_time.py
--- a/pypy/module/rctime/interp_time.py
+++ b/pypy/module/rctime/interp_time.py
@@ -3,7 +3,7 @@
 from pypy.interpreter.error import OperationError, operationerrfmt
 from pypy.interpreter.gateway import unwrap_spec
 from pypy.rpython.lltypesystem import lltype
-from pypy.rlib.rarithmetic import ovfcheck_float_to_int
+from pypy.rlib.rarithmetic import ovfcheck_float_to_int, intmask
 from pypy.rlib import rposix
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
 import os
@@ -585,7 +585,7 @@
                 # More likely, the format yields an empty result,
                 # e.g. an empty format, or %Z when the timezone
                 # is unknown.
-                result = rffi.charp2strn(outbuf, buflen)
+                result = rffi.charp2strn(outbuf, intmask(buflen))
                 return space.wrap(result)
         finally:
             lltype.free(outbuf, flavor='raw')


More information about the pypy-commit mailing list