Author: Amaury Forgeot d'Arc <amaur...@gmail.com> Branch: py3k Changeset: r48173:3693b7e7f95e Date: 2011-10-18 00:35 +0200 http://bitbucket.org/pypy/pypy/changeset/3693b7e7f95e/
Log: Translation fixes diff --git a/pypy/interpreter/module.py b/pypy/interpreter/module.py --- a/pypy/interpreter/module.py +++ b/pypy/interpreter/module.py @@ -31,7 +31,7 @@ def install(self): """NOT_RPYTHON: installs this module into space.builtin_modules""" w_mod = self.space.wrap(self) - self.space.builtin_modules[self.space.unwrap(self.w_name)] = w_mod + self.space.builtin_modules[self.space.str_w(self.w_name)] = w_mod def setup_after_space_initialization(self): """NOT_RPYTHON: to allow built-in modules to do some more setup diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py --- a/pypy/objspace/std/bytearrayobject.py +++ b/pypy/objspace/std/bytearrayobject.py @@ -293,58 +293,58 @@ return space.wrap(count) def str_count__Bytearray_ANY_ANY_ANY(space, w_bytearray, w_char, w_start, w_stop): - w_char = space.wrap(space.bufferstr_new_w(w_char)) + w_char = space.wrapbytes(space.bufferstr_new_w(w_char)) w_str = _to_bytes(space, w_bytearray) return stringobject.str_count__String_String_ANY_ANY(space, w_str, w_char, w_start, w_stop) def str_index__Bytearray_ANY_ANY_ANY(space, w_bytearray, w_char, w_start, w_stop): - w_char = space.wrap(space.bufferstr_new_w(w_char)) + w_char = space.wrapbytes(space.bufferstr_new_w(w_char)) w_str = _to_bytes(space, w_bytearray) return stringobject.str_index__String_String_ANY_ANY(space, w_str, w_char, w_start, w_stop) def str_rindex__Bytearray_ANY_ANY_ANY(space, w_bytearray, w_char, w_start, w_stop): - w_char = space.wrap(space.bufferstr_new_w(w_char)) + w_char = space.wrapbytes(space.bufferstr_new_w(w_char)) w_str = _to_bytes(space, w_bytearray) return stringobject.str_rindex__String_String_ANY_ANY(space, w_str, w_char, w_start, w_stop) def str_find__Bytearray_ANY_ANY_ANY(space, w_bytearray, w_char, w_start, w_stop): - w_char = space.wrap(space.bufferstr_new_w(w_char)) + w_char = space.wrapbytes(space.bufferstr_new_w(w_char)) w_str = _to_bytes(space, w_bytearray) return stringobject.str_find__String_String_ANY_ANY(space, w_str, w_char, w_start, w_stop) def str_rfind__Bytearray_ANY_ANY_ANY(space, w_bytearray, w_char, w_start, w_stop): - w_char = space.wrap(space.bufferstr_new_w(w_char)) + w_char = space.wrapbytes(space.bufferstr_new_w(w_char)) w_str = _to_bytes(space, w_bytearray) return stringobject.str_rfind__String_String_ANY_ANY(space, w_str, w_char, w_start, w_stop) def str_startswith__Bytearray_ANY_ANY_ANY(space, w_bytearray, w_prefix, w_start, w_stop): - w_prefix = space.wrap(space.bufferstr_new_w(w_prefix)) + w_prefix = space.wrapbytes(space.bufferstr_new_w(w_prefix)) w_str = _to_bytes(space, w_bytearray) return stringobject.str_startswith__String_String_ANY_ANY(space, w_str, w_prefix, w_start, w_stop) def str_startswith__Bytearray_Tuple_ANY_ANY(space, w_bytearray, w_prefix, w_start, w_stop): w_str = _to_bytes(space, w_bytearray) - w_prefix = space.newtuple([space.wrap(space.bufferstr_new_w(w_entry)) for w_entry in - space.unpackiterable(w_prefix)]) + w_prefix = space.newtuple([space.wrapbytes(space.bufferstr_new_w(w_entry)) + for w_entry in space.unpackiterable(w_prefix)]) return stringobject.str_startswith__String_Tuple_ANY_ANY(space, w_str, w_prefix, w_start, w_stop) def str_endswith__Bytearray_ANY_ANY_ANY(space, w_bytearray, w_suffix, w_start, w_stop): - w_suffix = space.wrap(space.bufferstr_new_w(w_suffix)) + w_suffix = space.wrapbytes(space.bufferstr_new_w(w_suffix)) w_str = _to_bytes(space, w_bytearray) return stringobject.str_endswith__String_String_ANY_ANY(space, w_str, w_suffix, w_start, w_stop) def str_endswith__Bytearray_Tuple_ANY_ANY(space, w_bytearray, w_suffix, w_start, w_stop): w_str = _to_bytes(space, w_bytearray) - w_suffix = space.newtuple([space.wrap(space.bufferstr_new_w(w_entry)) for w_entry in - space.unpackiterable(w_suffix)]) + w_suffix = space.newtuple([space.wrapbytes(space.bufferstr_new_w(w_entry)) + for w_entry in space.unpackiterable(w_suffix)]) return stringobject.str_endswith__String_Tuple_ANY_ANY(space, w_str, w_suffix, w_start, w_stop) diff --git a/pypy/objspace/std/stringobject.py b/pypy/objspace/std/stringobject.py --- a/pypy/objspace/std/stringobject.py +++ b/pypy/objspace/std/stringobject.py @@ -640,8 +640,8 @@ def str_endswith__String_Tuple_ANY_ANY(space, w_self, w_suffixes, w_start, w_end): (u_self, _, start, end) = _convert_idx_params(space, w_self, - space.wrap(''), w_start, - w_end, True) + space.wrapbytes(''), + w_start, w_end, True) for w_suffix in space.fixedview(w_suffixes): if space.isinstance_w(w_suffix, space.w_unicode): w_u = space.call_function(space.w_unicode, w_self) @@ -659,7 +659,8 @@ return space.newbool(stringstartswith(u_self, prefix, start, end)) def str_startswith__String_Tuple_ANY_ANY(space, w_self, w_prefixes, w_start, w_end): - (u_self, _, start, end) = _convert_idx_params(space, w_self, space.wrap(''), + (u_self, _, start, end) = _convert_idx_params(space, w_self, + space.wrapbytes(''), w_start, w_end, True) for w_prefix in space.fixedview(w_prefixes): if space.isinstance_w(w_prefix, space.w_unicode): diff --git a/pypy/rlib/rbigint.py b/pypy/rlib/rbigint.py --- a/pypy/rlib/rbigint.py +++ b/pypy/rlib/rbigint.py @@ -231,7 +231,7 @@ accumbits -= SHIFT if accumbits: digits.append(_store_digit(accum)) - return rbigint(digits, 1) + return rbigint(digits[:], 1) @jit.elidable def toint(self): _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit