Author: Amaury Forgeot d'Arc <[email protected]>
Branch: decimal-libmpdec
Changeset: r71553:3d5dc83a95a4
Date: 2014-05-16 21:57 +0200
http://bitbucket.org/pypy/pypy/changeset/3d5dc83a95a4/
Log: Tranlation fixes
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -1548,7 +1548,7 @@
if space.isinstance_w(w_source, space.w_unicode):
from pypy.interpreter.unicodehelper import encode
- w_source = encode(space, w_source)
+ w_source = encode(space, w_source, 'utf-8')
source = space.bytes0_w(w_source)
flags |= consts.PyCF_IGNORE_COOKIE
elif space.isinstance_w(w_source, space.w_bytes):
diff --git a/pypy/module/_decimal/__init__.py b/pypy/module/_decimal/__init__.py
--- a/pypy/module/_decimal/__init__.py
+++ b/pypy/module/_decimal/__init__.py
@@ -18,6 +18,9 @@
'IEEE_CONTEXT_MAX_BITS':
'space.wrap(interp_decimal.IEEE_CONTEXT_MAX_BITS)',
'MAX_PREC': 'space.wrap(interp_decimal.MAX_PREC)',
+ 'MAX_EMAX': 'space.wrap(interp_decimal.MAX_EMAX)',
+ 'MAX_EMIN': 'space.wrap(interp_decimal.MAX_EMIN)',
+ 'MAX_ETINY': 'space.wrap(interp_decimal.MAX_ETINY)',
}
for name in rmpdec.ROUND_CONSTANTS:
interpleveldefs[name] = 'space.wrap(%r)' % name
diff --git a/pypy/module/_decimal/interp_decimal.py
b/pypy/module/_decimal/interp_decimal.py
--- a/pypy/module/_decimal/interp_decimal.py
+++ b/pypy/module/_decimal/interp_decimal.py
@@ -13,6 +13,10 @@
IEEE_CONTEXT_MAX_BITS = rmpdec.MPD_IEEE_CONTEXT_MAX_BITS
MAX_PREC = rmpdec.MPD_MAX_PREC
+MAX_EMAX = rmpdec.MPD_MAX_EMAX
+MAX_EMIN = rmpdec.MPD_MAX_EMIN
+MAX_ETINY = rmpdec.MPD_MAX_ETINY
+
# DEC_MINALLOC >= MPD_MINALLOC
DEC_MINALLOC = 4
@@ -306,7 +310,7 @@
w_result = W_Decimal.allocate(space)
with context.catch_status(space) as (ctx, status_ptr):
rmpdec.mpd_qcopy_sign(w_result.mpd, self.mpd, w_other.mpd,
- ctx, status_ptr)
+ status_ptr)
return w_result
# Boolean functions
diff --git a/rpython/rlib/rmpdec.py b/rpython/rlib/rmpdec.py
--- a/rpython/rlib/rmpdec.py
+++ b/rpython/rlib/rmpdec.py
@@ -90,6 +90,9 @@
MPD_IEEE_CONTEXT_MAX_BITS = platform.ConstantInteger(
'MPD_IEEE_CONTEXT_MAX_BITS')
MPD_MAX_PREC = platform.ConstantInteger('MPD_MAX_PREC')
+ MPD_MAX_EMAX = platform.ConstantInteger('MPD_MAX_EMAX')
+ MPD_MAX_EMIN = platform.ConstantInteger('MPD_MAX_EMIN')
+ MPD_MAX_ETINY = platform.ConstantInteger('MPD_MAX_ETINY')
MPD_MAX_SIGNAL_LIST = platform.ConstantInteger('MPD_MAX_SIGNAL_LIST')
MPD_SIZE_MAX = platform.ConstantInteger('MPD_SIZE_MAX')
MPD_SSIZE_MAX = platform.ConstantInteger('MPD_SSIZE_MAX')
@@ -334,7 +337,7 @@
mpd_qcopy_sign = external(
'mpd_qcopy_sign',
- [MPD_PTR, MPD_PTR, MPD_PTR, MPD_CONTEXT_PTR, rffi.UINTP],
+ [MPD_PTR, MPD_PTR, MPD_PTR, rffi.UINTP],
lltype.Void)
mpd_qround_to_int = external(
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
