[pypy-commit] pypy py3.5: hg merge
mjacob
pypy.commits at gmail.com
Fri Aug 18 15:21:34 EDT 2017
Author: Manuel Jacob <me at manueljacob.de>
Branch: py3.5
Changeset: r92172:9872266a277f
Date: 2017-08-18 21:20 +0200
http://bitbucket.org/pypy/pypy/changeset/9872266a277f/
Log: hg merge
diff --git a/pypy/objspace/std/bytesobject.py b/pypy/objspace/std/bytesobject.py
--- a/pypy/objspace/std/bytesobject.py
+++ b/pypy/objspace/std/bytesobject.py
@@ -364,8 +364,8 @@
characters, all remaining cased characters have lowercase.
"""
- @unwrap_spec(w_deletechars=WrappedDefault(''))
- def descr_translate(self, space, w_table, w_deletechars):
+ @unwrap_spec(w_delete=WrappedDefault(''))
+ def descr_translate(self, space, w_table, w_delete):
"""B.translate(table[, deletechars]) -> copy of B
Return a copy of the string B, where all characters occurring
diff --git a/pypy/objspace/std/stringmethods.py b/pypy/objspace/std/stringmethods.py
--- a/pypy/objspace/std/stringmethods.py
+++ b/pypy/objspace/std/stringmethods.py
@@ -742,8 +742,8 @@
DEFAULT_NOOP_TABLE = ''.join([chr(i) for i in range(256)])
# for bytes and bytearray, overridden by unicode
- @unwrap_spec(w_deletechars=WrappedDefault(''))
- def descr_translate(self, space, w_table, w_deletechars):
+ @unwrap_spec(w_delete=WrappedDefault(''))
+ def descr_translate(self, space, w_table, w_delete):
if space.is_w(w_table, space.w_None):
table = self.DEFAULT_NOOP_TABLE
else:
@@ -753,7 +753,7 @@
"translation table must be 256 characters long")
string = self._val(space)
- deletechars = self._op_val(space, w_deletechars)
+ deletechars = self._op_val(space, w_delete)
if len(deletechars) == 0:
buf = self._builder(len(string))
for char in string:
More information about the pypy-commit
mailing list