Author: Manuel Jacob
Branch: refactor-str-types
Changeset: r65651:a1d09ff7418a
Date: 2013-07-25 18:55 +0200
http://bitbucket.org/pypy/pypy/changeset/a1d09ff7418a/
Log: Back out changeset a2881bd0264c.
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
@@ -3,7 +3,7 @@
from pypy.interpreter.baseobjspace import ObjSpace, W_Root
from pypy.interpreter.buffer import RWBuffer
from pypy.interpreter.error import OperationError, operationerrfmt
-from pypy.interpreter.gateway import interp2app, interpindirect2app,
unwrap_spec, WrappedDefault
+from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
from pypy.interpreter.signature import Signature
from pypy.objspace.std import bytesobject
from pypy.objspace.std.intobject import W_IntObject
@@ -427,58 +427,58 @@
__repr__ = interp2app(W_BytearrayObject.descr_repr),
__str__ = interp2app(W_BytearrayObject.descr_str),
- __eq__ = interpindirect2app(W_BytearrayObject.descr_eq),
- __ne__ = interpindirect2app(W_BytearrayObject.descr_ne),
- __lt__ = interpindirect2app(W_BytearrayObject.descr_lt),
- __le__ = interpindirect2app(W_BytearrayObject.descr_le),
- __gt__ = interpindirect2app(W_BytearrayObject.descr_gt),
- __ge__ = interpindirect2app(W_BytearrayObject.descr_ge),
+ __eq__ = interp2app(W_BytearrayObject.descr_eq),
+ __ne__ = interp2app(W_BytearrayObject.descr_ne),
+ __lt__ = interp2app(W_BytearrayObject.descr_lt),
+ __le__ = interp2app(W_BytearrayObject.descr_le),
+ __gt__ = interp2app(W_BytearrayObject.descr_gt),
+ __ge__ = interp2app(W_BytearrayObject.descr_ge),
- __len__ = interpindirect2app(W_BytearrayObject.descr_len),
- __contains__ = interpindirect2app(W_BytearrayObject.descr_contains),
+ __len__ = interp2app(W_BytearrayObject.descr_len),
+ __contains__ = interp2app(W_BytearrayObject.descr_contains),
- __add__ = interpindirect2app(W_BytearrayObject.descr_add),
- __mul__ = interpindirect2app(W_BytearrayObject.descr_mul),
- __rmul__ = interpindirect2app(W_BytearrayObject.descr_mul),
+ __add__ = interp2app(W_BytearrayObject.descr_add),
+ __mul__ = interp2app(W_BytearrayObject.descr_mul),
+ __rmul__ = interp2app(W_BytearrayObject.descr_mul),
- __getitem__ = interpindirect2app(W_BytearrayObject.descr_getitem),
+ __getitem__ = interp2app(W_BytearrayObject.descr_getitem),
- capitalize = interpindirect2app(W_BytearrayObject.descr_capitalize),
- center = interpindirect2app(W_BytearrayObject.descr_center),
- count = interpindirect2app(W_BytearrayObject.descr_count),
- decode = interpindirect2app(W_BytearrayObject.descr_decode),
- expandtabs = interpindirect2app(W_BytearrayObject.descr_expandtabs),
- find = interpindirect2app(W_BytearrayObject.descr_find),
- rfind = interpindirect2app(W_BytearrayObject.descr_rfind),
- index = interpindirect2app(W_BytearrayObject.descr_index),
- rindex = interpindirect2app(W_BytearrayObject.descr_rindex),
- isalnum = interpindirect2app(W_BytearrayObject.descr_isalnum),
- isalpha = interpindirect2app(W_BytearrayObject.descr_isalpha),
- isdigit = interpindirect2app(W_BytearrayObject.descr_isdigit),
- islower = interpindirect2app(W_BytearrayObject.descr_islower),
- isspace = interpindirect2app(W_BytearrayObject.descr_isspace),
- istitle = interpindirect2app(W_BytearrayObject.descr_istitle),
- isupper = interpindirect2app(W_BytearrayObject.descr_isupper),
- join = interpindirect2app(W_BytearrayObject.descr_join),
- ljust = interpindirect2app(W_BytearrayObject.descr_ljust),
- rjust = interpindirect2app(W_BytearrayObject.descr_rjust),
- lower = interpindirect2app(W_BytearrayObject.descr_lower),
- partition = interpindirect2app(W_BytearrayObject.descr_partition),
- rpartition = interpindirect2app(W_BytearrayObject.descr_rpartition),
- replace = interpindirect2app(W_BytearrayObject.descr_replace),
- split = interpindirect2app(W_BytearrayObject.descr_split),
- rsplit = interpindirect2app(W_BytearrayObject.descr_rsplit),
- splitlines = interpindirect2app(W_BytearrayObject.descr_splitlines),
- startswith = interpindirect2app(W_BytearrayObject.descr_startswith),
- endswith = interpindirect2app(W_BytearrayObject.descr_endswith),
- strip = interpindirect2app(W_BytearrayObject.descr_strip),
- lstrip = interpindirect2app(W_BytearrayObject.descr_lstrip),
- rstrip = interpindirect2app(W_BytearrayObject.descr_rstrip),
- swapcase = interpindirect2app(W_BytearrayObject.descr_swapcase),
- title = interpindirect2app(W_BytearrayObject.descr_title),
- translate = interpindirect2app(W_BytearrayObject.descr_translate),
- upper = interpindirect2app(W_BytearrayObject.descr_upper),
- zfill = interpindirect2app(W_BytearrayObject.descr_zfill),
+ capitalize = interp2app(W_BytearrayObject.descr_capitalize),
+ center = interp2app(W_BytearrayObject.descr_center),
+ count = interp2app(W_BytearrayObject.descr_count),
+ decode = interp2app(W_BytearrayObject.descr_decode),
+ expandtabs = interp2app(W_BytearrayObject.descr_expandtabs),
+ find = interp2app(W_BytearrayObject.descr_find),
+ rfind = interp2app(W_BytearrayObject.descr_rfind),
+ index = interp2app(W_BytearrayObject.descr_index),
+ rindex = interp2app(W_BytearrayObject.descr_rindex),
+ isalnum = interp2app(W_BytearrayObject.descr_isalnum),
+ isalpha = interp2app(W_BytearrayObject.descr_isalpha),
+ isdigit = interp2app(W_BytearrayObject.descr_isdigit),
+ islower = interp2app(W_BytearrayObject.descr_islower),
+ isspace = interp2app(W_BytearrayObject.descr_isspace),
+ istitle = interp2app(W_BytearrayObject.descr_istitle),
+ isupper = interp2app(W_BytearrayObject.descr_isupper),
+ join = interp2app(W_BytearrayObject.descr_join),
+ ljust = interp2app(W_BytearrayObject.descr_ljust),
+ rjust = interp2app(W_BytearrayObject.descr_rjust),
+ lower = interp2app(W_BytearrayObject.descr_lower),
+ partition = interp2app(W_BytearrayObject.descr_partition),
+ rpartition = interp2app(W_BytearrayObject.descr_rpartition),
+ replace = interp2app(W_BytearrayObject.descr_replace),
+ split = interp2app(W_BytearrayObject.descr_split),
+ rsplit = interp2app(W_BytearrayObject.descr_rsplit),
+ splitlines = interp2app(W_BytearrayObject.descr_splitlines),
+ startswith = interp2app(W_BytearrayObject.descr_startswith),
+ endswith = interp2app(W_BytearrayObject.descr_endswith),
+ strip = interp2app(W_BytearrayObject.descr_strip),
+ lstrip = interp2app(W_BytearrayObject.descr_lstrip),
+ rstrip = interp2app(W_BytearrayObject.descr_rstrip),
+ swapcase = interp2app(W_BytearrayObject.descr_swapcase),
+ title = interp2app(W_BytearrayObject.descr_title),
+ translate = interp2app(W_BytearrayObject.descr_translate),
+ upper = interp2app(W_BytearrayObject.descr_upper),
+ zfill = interp2app(W_BytearrayObject.descr_zfill),
__init__ = interp2app(W_BytearrayObject.descr_init),
__buffer__ = interp2app(W_BytearrayObject.descr_buffer),
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
@@ -2,7 +2,7 @@
from pypy.interpreter.buffer import StringBuffer
from pypy.interpreter.error import operationerrfmt
-from pypy.interpreter.gateway import interp2app, interpindirect2app,
unwrap_spec, WrappedDefault
+from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
from pypy.objspace.std import newformat
from pypy.objspace.std.basestringtype import basestring_typedef
from pypy.objspace.std.formatting import mod_format
@@ -262,60 +262,60 @@
__str__ = interp2app(W_BytesObject.descr_str),
__hash__ = interp2app(W_BytesObject.descr_hash),
- __eq__ = interpindirect2app(W_BytesObject.descr_eq),
- __ne__ = interpindirect2app(W_BytesObject.descr_ne),
- __lt__ = interpindirect2app(W_BytesObject.descr_lt),
- __le__ = interpindirect2app(W_BytesObject.descr_le),
- __gt__ = interpindirect2app(W_BytesObject.descr_gt),
- __ge__ = interpindirect2app(W_BytesObject.descr_ge),
+ __eq__ = interp2app(W_BytesObject.descr_eq),
+ __ne__ = interp2app(W_BytesObject.descr_ne),
+ __lt__ = interp2app(W_BytesObject.descr_lt),
+ __le__ = interp2app(W_BytesObject.descr_le),
+ __gt__ = interp2app(W_BytesObject.descr_gt),
+ __ge__ = interp2app(W_BytesObject.descr_ge),
- __len__ = interpindirect2app(W_BytesObject.descr_len),
- __contains__ = interpindirect2app(W_BytesObject.descr_contains),
+ __len__ = interp2app(W_BytesObject.descr_len),
+ __contains__ = interp2app(W_BytesObject.descr_contains),
- __add__ = interpindirect2app(W_BytesObject.descr_add),
- __mul__ = interpindirect2app(W_BytesObject.descr_mul),
- __rmul__ = interpindirect2app(W_BytesObject.descr_mul),
+ __add__ = interp2app(W_BytesObject.descr_add),
+ __mul__ = interp2app(W_BytesObject.descr_mul),
+ __rmul__ = interp2app(W_BytesObject.descr_mul),
- __getitem__ = interpindirect2app(W_BytesObject.descr_getitem),
- __getslice__ = interpindirect2app(W_BytesObject.descr_getslice),
+ __getitem__ = interp2app(W_BytesObject.descr_getitem),
+ __getslice__ = interp2app(W_BytesObject.descr_getslice),
- capitalize = interpindirect2app(W_BytesObject.descr_capitalize),
- center = interpindirect2app(W_BytesObject.descr_center),
- count = interpindirect2app(W_BytesObject.descr_count),
- decode = interpindirect2app(W_BytesObject.descr_decode),
- encode = interpindirect2app(W_BytesObject.descr_encode),
- expandtabs = interpindirect2app(W_BytesObject.descr_expandtabs),
- find = interpindirect2app(W_BytesObject.descr_find),
- rfind = interpindirect2app(W_BytesObject.descr_rfind),
- index = interpindirect2app(W_BytesObject.descr_index),
- rindex = interpindirect2app(W_BytesObject.descr_rindex),
- isalnum = interpindirect2app(W_BytesObject.descr_isalnum),
- isalpha = interpindirect2app(W_BytesObject.descr_isalpha),
- isdigit = interpindirect2app(W_BytesObject.descr_isdigit),
- islower = interpindirect2app(W_BytesObject.descr_islower),
- isspace = interpindirect2app(W_BytesObject.descr_isspace),
- istitle = interpindirect2app(W_BytesObject.descr_istitle),
- isupper = interpindirect2app(W_BytesObject.descr_isupper),
- join = interpindirect2app(W_BytesObject.descr_join),
- ljust = interpindirect2app(W_BytesObject.descr_ljust),
- rjust = interpindirect2app(W_BytesObject.descr_rjust),
- lower = interpindirect2app(W_BytesObject.descr_lower),
- partition = interpindirect2app(W_BytesObject.descr_partition),
- rpartition = interpindirect2app(W_BytesObject.descr_rpartition),
- replace = interpindirect2app(W_BytesObject.descr_replace),
- split = interpindirect2app(W_BytesObject.descr_split),
- rsplit = interpindirect2app(W_BytesObject.descr_rsplit),
- splitlines = interpindirect2app(W_BytesObject.descr_splitlines),
- startswith = interpindirect2app(W_BytesObject.descr_startswith),
- endswith = interpindirect2app(W_BytesObject.descr_endswith),
- strip = interpindirect2app(W_BytesObject.descr_strip),
- lstrip = interpindirect2app(W_BytesObject.descr_lstrip),
- rstrip = interpindirect2app(W_BytesObject.descr_rstrip),
- swapcase = interpindirect2app(W_BytesObject.descr_swapcase),
- title = interpindirect2app(W_BytesObject.descr_title),
- translate = interpindirect2app(W_BytesObject.descr_translate),
- upper = interpindirect2app(W_BytesObject.descr_upper),
- zfill = interpindirect2app(W_BytesObject.descr_zfill),
+ capitalize = interp2app(W_BytesObject.descr_capitalize),
+ center = interp2app(W_BytesObject.descr_center),
+ count = interp2app(W_BytesObject.descr_count),
+ decode = interp2app(W_BytesObject.descr_decode),
+ encode = interp2app(W_BytesObject.descr_encode),
+ expandtabs = interp2app(W_BytesObject.descr_expandtabs),
+ find = interp2app(W_BytesObject.descr_find),
+ rfind = interp2app(W_BytesObject.descr_rfind),
+ index = interp2app(W_BytesObject.descr_index),
+ rindex = interp2app(W_BytesObject.descr_rindex),
+ isalnum = interp2app(W_BytesObject.descr_isalnum),
+ isalpha = interp2app(W_BytesObject.descr_isalpha),
+ isdigit = interp2app(W_BytesObject.descr_isdigit),
+ islower = interp2app(W_BytesObject.descr_islower),
+ isspace = interp2app(W_BytesObject.descr_isspace),
+ istitle = interp2app(W_BytesObject.descr_istitle),
+ isupper = interp2app(W_BytesObject.descr_isupper),
+ join = interp2app(W_BytesObject.descr_join),
+ ljust = interp2app(W_BytesObject.descr_ljust),
+ rjust = interp2app(W_BytesObject.descr_rjust),
+ lower = interp2app(W_BytesObject.descr_lower),
+ partition = interp2app(W_BytesObject.descr_partition),
+ rpartition = interp2app(W_BytesObject.descr_rpartition),
+ replace = interp2app(W_BytesObject.descr_replace),
+ split = interp2app(W_BytesObject.descr_split),
+ rsplit = interp2app(W_BytesObject.descr_rsplit),
+ splitlines = interp2app(W_BytesObject.descr_splitlines),
+ startswith = interp2app(W_BytesObject.descr_startswith),
+ endswith = interp2app(W_BytesObject.descr_endswith),
+ strip = interp2app(W_BytesObject.descr_strip),
+ lstrip = interp2app(W_BytesObject.descr_lstrip),
+ rstrip = interp2app(W_BytesObject.descr_rstrip),
+ swapcase = interp2app(W_BytesObject.descr_swapcase),
+ title = interp2app(W_BytesObject.descr_title),
+ translate = interp2app(W_BytesObject.descr_translate),
+ upper = interp2app(W_BytesObject.descr_upper),
+ zfill = interp2app(W_BytesObject.descr_zfill),
format = interp2app(W_BytesObject.descr_format),
__format__ = interp2app(W_BytesObject.descr__format__),
diff --git a/pypy/objspace/std/unicodeobject.py
b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeobject.py
+++ b/pypy/objspace/std/unicodeobject.py
@@ -2,7 +2,7 @@
from pypy.interpreter import unicodehelper
from pypy.interpreter.error import OperationError, operationerrfmt
-from pypy.interpreter.gateway import interp2app, interpindirect2app,
unwrap_spec, WrappedDefault
+from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
from pypy.module.unicodedata import unicodedb
from pypy.objspace.std import newformat
from pypy.objspace.std.basestringtype import basestring_typedef
@@ -403,60 +403,60 @@
__str__ = interp2app(W_UnicodeObject.descr_str),
__hash__ = interp2app(W_UnicodeObject.descr_hash),
- __eq__ = interpindirect2app(W_UnicodeObject.descr_eq),
- __ne__ = interpindirect2app(W_UnicodeObject.descr_ne),
- __lt__ = interpindirect2app(W_UnicodeObject.descr_lt),
- __le__ = interpindirect2app(W_UnicodeObject.descr_le),
- __gt__ = interpindirect2app(W_UnicodeObject.descr_gt),
- __ge__ = interpindirect2app(W_UnicodeObject.descr_ge),
+ __eq__ = interp2app(W_UnicodeObject.descr_eq),
+ __ne__ = interp2app(W_UnicodeObject.descr_ne),
+ __lt__ = interp2app(W_UnicodeObject.descr_lt),
+ __le__ = interp2app(W_UnicodeObject.descr_le),
+ __gt__ = interp2app(W_UnicodeObject.descr_gt),
+ __ge__ = interp2app(W_UnicodeObject.descr_ge),
- __len__ = interpindirect2app(W_UnicodeObject.descr_len),
- __contains__ = interpindirect2app(W_UnicodeObject.descr_contains),
+ __len__ = interp2app(W_UnicodeObject.descr_len),
+ __contains__ = interp2app(W_UnicodeObject.descr_contains),
- __add__ = interpindirect2app(W_UnicodeObject.descr_add),
- __mul__ = interpindirect2app(W_UnicodeObject.descr_mul),
- __rmul__ = interpindirect2app(W_UnicodeObject.descr_mul),
+ __add__ = interp2app(W_UnicodeObject.descr_add),
+ __mul__ = interp2app(W_UnicodeObject.descr_mul),
+ __rmul__ = interp2app(W_UnicodeObject.descr_mul),
- __getitem__ = interpindirect2app(W_UnicodeObject.descr_getitem),
- __getslice__ = interpindirect2app(W_UnicodeObject.descr_getslice),
+ __getitem__ = interp2app(W_UnicodeObject.descr_getitem),
+ __getslice__ = interp2app(W_UnicodeObject.descr_getslice),
- capitalize = interpindirect2app(W_UnicodeObject.descr_capitalize),
- center = interpindirect2app(W_UnicodeObject.descr_center),
- count = interpindirect2app(W_UnicodeObject.descr_count),
- decode = interpindirect2app(W_UnicodeObject.descr_decode),
- encode = interpindirect2app(W_UnicodeObject.descr_encode),
- expandtabs = interpindirect2app(W_UnicodeObject.descr_expandtabs),
- find = interpindirect2app(W_UnicodeObject.descr_find),
- rfind = interpindirect2app(W_UnicodeObject.descr_rfind),
- index = interpindirect2app(W_UnicodeObject.descr_index),
- rindex = interpindirect2app(W_UnicodeObject.descr_rindex),
- isalnum = interpindirect2app(W_UnicodeObject.descr_isalnum),
- isalpha = interpindirect2app(W_UnicodeObject.descr_isalpha),
- isdigit = interpindirect2app(W_UnicodeObject.descr_isdigit),
- islower = interpindirect2app(W_UnicodeObject.descr_islower),
- isspace = interpindirect2app(W_UnicodeObject.descr_isspace),
- istitle = interpindirect2app(W_UnicodeObject.descr_istitle),
- isupper = interpindirect2app(W_UnicodeObject.descr_isupper),
- join = interpindirect2app(W_UnicodeObject.descr_join),
- ljust = interpindirect2app(W_UnicodeObject.descr_ljust),
- rjust = interpindirect2app(W_UnicodeObject.descr_rjust),
- lower = interpindirect2app(W_UnicodeObject.descr_lower),
- partition = interpindirect2app(W_UnicodeObject.descr_partition),
- rpartition = interpindirect2app(W_UnicodeObject.descr_rpartition),
- replace = interpindirect2app(W_UnicodeObject.descr_replace),
- split = interpindirect2app(W_UnicodeObject.descr_split),
- rsplit = interpindirect2app(W_UnicodeObject.descr_rsplit),
- splitlines = interpindirect2app(W_UnicodeObject.descr_splitlines),
- startswith = interpindirect2app(W_UnicodeObject.descr_startswith),
- endswith = interpindirect2app(W_UnicodeObject.descr_endswith),
- strip = interpindirect2app(W_UnicodeObject.descr_strip),
- lstrip = interpindirect2app(W_UnicodeObject.descr_lstrip),
- rstrip = interpindirect2app(W_UnicodeObject.descr_rstrip),
- swapcase = interpindirect2app(W_UnicodeObject.descr_swapcase),
- title = interpindirect2app(W_UnicodeObject.descr_title),
- translate = interpindirect2app(W_UnicodeObject.descr_translate),
- upper = interpindirect2app(W_UnicodeObject.descr_upper),
- zfill = interpindirect2app(W_UnicodeObject.descr_zfill),
+ capitalize = interp2app(W_UnicodeObject.descr_capitalize),
+ center = interp2app(W_UnicodeObject.descr_center),
+ count = interp2app(W_UnicodeObject.descr_count),
+ decode = interp2app(W_UnicodeObject.descr_decode),
+ encode = interp2app(W_UnicodeObject.descr_encode),
+ expandtabs = interp2app(W_UnicodeObject.descr_expandtabs),
+ find = interp2app(W_UnicodeObject.descr_find),
+ rfind = interp2app(W_UnicodeObject.descr_rfind),
+ index = interp2app(W_UnicodeObject.descr_index),
+ rindex = interp2app(W_UnicodeObject.descr_rindex),
+ isalnum = interp2app(W_UnicodeObject.descr_isalnum),
+ isalpha = interp2app(W_UnicodeObject.descr_isalpha),
+ isdigit = interp2app(W_UnicodeObject.descr_isdigit),
+ islower = interp2app(W_UnicodeObject.descr_islower),
+ isspace = interp2app(W_UnicodeObject.descr_isspace),
+ istitle = interp2app(W_UnicodeObject.descr_istitle),
+ isupper = interp2app(W_UnicodeObject.descr_isupper),
+ join = interp2app(W_UnicodeObject.descr_join),
+ ljust = interp2app(W_UnicodeObject.descr_ljust),
+ rjust = interp2app(W_UnicodeObject.descr_rjust),
+ lower = interp2app(W_UnicodeObject.descr_lower),
+ partition = interp2app(W_UnicodeObject.descr_partition),
+ rpartition = interp2app(W_UnicodeObject.descr_rpartition),
+ replace = interp2app(W_UnicodeObject.descr_replace),
+ split = interp2app(W_UnicodeObject.descr_split),
+ rsplit = interp2app(W_UnicodeObject.descr_rsplit),
+ splitlines = interp2app(W_UnicodeObject.descr_splitlines),
+ startswith = interp2app(W_UnicodeObject.descr_startswith),
+ endswith = interp2app(W_UnicodeObject.descr_endswith),
+ strip = interp2app(W_UnicodeObject.descr_strip),
+ lstrip = interp2app(W_UnicodeObject.descr_lstrip),
+ rstrip = interp2app(W_UnicodeObject.descr_rstrip),
+ swapcase = interp2app(W_UnicodeObject.descr_swapcase),
+ title = interp2app(W_UnicodeObject.descr_title),
+ translate = interp2app(W_UnicodeObject.descr_translate),
+ upper = interp2app(W_UnicodeObject.descr_upper),
+ zfill = interp2app(W_UnicodeObject.descr_zfill),
format = interp2app(W_UnicodeObject.descr_format),
__format__ = interp2app(W_UnicodeObject.descr__format__),
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
