[pypy-svn] r19048 - pypy/dist/pypy/objspace/std
cfbolz at codespeak.net
cfbolz at codespeak.net
Thu Oct 27 01:43:44 CEST 2005
Author: cfbolz
Date: Thu Oct 27 01:43:41 2005
New Revision: 19048
Modified:
pypy/dist/pypy/objspace/std/dicttype.py
pypy/dist/pypy/objspace/std/listtype.py
pypy/dist/pypy/objspace/std/model.py
pypy/dist/pypy/objspace/std/objspace.py
pypy/dist/pypy/objspace/std/slicetype.py
pypy/dist/pypy/objspace/std/stdtypedef.py
pypy/dist/pypy/objspace/std/stringtype.py
pypy/dist/pypy/objspace/std/unicodetype.py
Log:
oops
Modified: pypy/dist/pypy/objspace/std/dicttype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/dicttype.py (original)
+++ pypy/dist/pypy/objspace/std/dicttype.py Thu Oct 27 01:43:41 2005
@@ -2,21 +2,21 @@
from pypy.objspace.std.register_all import register_all
from pypy.interpreter.error import OperationError
-dict_copy = StdObjspaceMultiMethod('copy', 1)
-dict_items = StdObjspaceMultiMethod('items', 1)
-dict_keys = StdObjspaceMultiMethod('keys', 1)
-dict_values = StdObjspaceMultiMethod('values', 1)
-dict_has_key = StdObjspaceMultiMethod('has_key', 2)
-dict_clear = StdObjspaceMultiMethod('clear', 1)
-dict_get = StdObjspaceMultiMethod('get', 3, defaults=(None,))
-dict_pop = StdObjspaceMultiMethod('pop', 2, w_varargs=True)
-dict_popitem = StdObjspaceMultiMethod('popitem', 1)
-dict_setdefault = StdObjspaceMultiMethod('setdefault', 3, defaults=(None,))
-dict_update = StdObjspaceMultiMethod('update', 2, defaults=((),))
-dict_iteritems = StdObjspaceMultiMethod('iteritems', 1)
-dict_iterkeys = StdObjspaceMultiMethod('iterkeys', 1)
-dict_itervalues = StdObjspaceMultiMethod('itervalues', 1)
-dict_reversed = StdObjspaceMultiMethod('__reversed__', 1)
+dict_copy = StdObjSpaceMultiMethod('copy', 1)
+dict_items = StdObjSpaceMultiMethod('items', 1)
+dict_keys = StdObjSpaceMultiMethod('keys', 1)
+dict_values = StdObjSpaceMultiMethod('values', 1)
+dict_has_key = StdObjSpaceMultiMethod('has_key', 2)
+dict_clear = StdObjSpaceMultiMethod('clear', 1)
+dict_get = StdObjSpaceMultiMethod('get', 3, defaults=(None,))
+dict_pop = StdObjSpaceMultiMethod('pop', 2, w_varargs=True)
+dict_popitem = StdObjSpaceMultiMethod('popitem', 1)
+dict_setdefault = StdObjSpaceMultiMethod('setdefault', 3, defaults=(None,))
+dict_update = StdObjSpaceMultiMethod('update', 2, defaults=((),))
+dict_iteritems = StdObjSpaceMultiMethod('iteritems', 1)
+dict_iterkeys = StdObjSpaceMultiMethod('iterkeys', 1)
+dict_itervalues = StdObjSpaceMultiMethod('itervalues', 1)
+dict_reversed = StdObjSpaceMultiMethod('__reversed__', 1)
def dict_reversed__ANY(space, w_dict):
raise OperationError(space.w_TypeError, space.wrap('argument to reversed() must be a sequence'))
Modified: pypy/dist/pypy/objspace/std/listtype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/listtype.py (original)
+++ pypy/dist/pypy/objspace/std/listtype.py Thu Oct 27 01:43:41 2005
@@ -3,16 +3,16 @@
from pypy.objspace.std.register_all import register_all
from sys import maxint
-list_append = StdObjspaceMultiMethod('append', 2)
-list_insert = StdObjspaceMultiMethod('insert', 3)
-list_extend = StdObjspaceMultiMethod('extend', 2)
-list_pop = StdObjspaceMultiMethod('pop', 2, defaults=(-1,))
-list_remove = StdObjspaceMultiMethod('remove', 2)
-list_index = StdObjspaceMultiMethod('index', 4, defaults=(0,maxint))
-list_count = StdObjspaceMultiMethod('count', 2)
-list_reverse = StdObjspaceMultiMethod('reverse',1)
-list_sort = StdObjspaceMultiMethod('sort', 4, defaults=(None, None, False), argnames=['cmp', 'key', 'reverse'])
-list_reversed = StdObjspaceMultiMethod('__reversed__', 1)
+list_append = StdObjSpaceMultiMethod('append', 2)
+list_insert = StdObjSpaceMultiMethod('insert', 3)
+list_extend = StdObjSpaceMultiMethod('extend', 2)
+list_pop = StdObjSpaceMultiMethod('pop', 2, defaults=(-1,))
+list_remove = StdObjSpaceMultiMethod('remove', 2)
+list_index = StdObjSpaceMultiMethod('index', 4, defaults=(0,maxint))
+list_count = StdObjSpaceMultiMethod('count', 2)
+list_reverse = StdObjSpaceMultiMethod('reverse',1)
+list_sort = StdObjSpaceMultiMethod('sort', 4, defaults=(None, None, False), argnames=['cmp', 'key', 'reverse'])
+list_reversed = StdObjSpaceMultiMethod('__reversed__', 1)
##
### gateway is imported in the stdtypedef module
##list_reversed__ANY = gateway.applevel('''
Modified: pypy/dist/pypy/objspace/std/model.py
==============================================================================
--- pypy/dist/pypy/objspace/std/model.py (original)
+++ pypy/dist/pypy/objspace/std/model.py Thu Oct 27 01:43:41 2005
@@ -143,7 +143,7 @@
pass
-class StdObjspaceMultiMethod(MultiMethodTable):
+class StdObjSpaceMultiMethod(MultiMethodTable):
def __init__(self, operatorsymbol, arity, specialnames=None, **extras):
"""NOT_RPYTHON: cannot create new multimethods dynamically.
Modified: pypy/dist/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/std/objspace.py (original)
+++ pypy/dist/pypy/objspace/std/objspace.py Thu Oct 27 01:43:41 2005
@@ -6,7 +6,7 @@
from pypy.interpreter.gateway import PyPyCacheDir
from pypy.tool.cache import Cache
from pypy.objspace.std.model import W_Object, UnwrapError
-from pypy.objspace.std.model import W_ANY, StdObjspaceMultiMethod, StdTypeModel
+from pypy.objspace.std.model import W_ANY, StdObjSpaceMultiMethod, StdTypeModel
from pypy.objspace.std.multimethod import FailedToImplement
from pypy.objspace.descroperation import DescrOperation
from pypy.objspace.std import stdtypedef
@@ -40,7 +40,7 @@
# install all the MultiMethods into the space instance
for name, mm in self.MM.__dict__.items():
- if isinstance(mm, StdObjspaceMultiMethod) and not hasattr(self, name):
+ if isinstance(mm, StdObjSpaceMultiMethod) and not hasattr(self, name):
if name.endswith('_w'): # int_w, str_w...: these do not return a wrapped object
func = mm.install_not_sliced(self.model.typeorder, baked_perform_call=True)
else:
@@ -431,21 +431,21 @@
class MM:
"Container for multimethods."
- call = StdObjspaceMultiMethod('call', 1, ['__call__'], general__args__=True)
- init = StdObjspaceMultiMethod('__init__', 1, general__args__=True)
- getnewargs = StdObjspaceMultiMethod('__getnewargs__', 1)
+ call = StdObjSpaceMultiMethod('call', 1, ['__call__'], general__args__=True)
+ init = StdObjSpaceMultiMethod('__init__', 1, general__args__=True)
+ getnewargs = StdObjSpaceMultiMethod('__getnewargs__', 1)
# special visible multimethods
- int_w = StdObjspaceMultiMethod('int_w', 1, []) # returns an unwrapped int
- str_w = StdObjspaceMultiMethod('str_w', 1, []) # returns an unwrapped string
- float_w = StdObjspaceMultiMethod('float_w', 1, []) # returns an unwrapped float
- uint_w = StdObjspaceMultiMethod('uint_w', 1, []) # returns an unwrapped unsigned int (r_uint)
- marshal_w = StdObjspaceMultiMethod('marshal_w', 1, [], extra_args=['marshaller'])
- log = StdObjspaceMultiMethod('log', 1, [], extra_args=['base'])
+ int_w = StdObjSpaceMultiMethod('int_w', 1, []) # returns an unwrapped int
+ str_w = StdObjSpaceMultiMethod('str_w', 1, []) # returns an unwrapped string
+ float_w = StdObjSpaceMultiMethod('float_w', 1, []) # returns an unwrapped float
+ uint_w = StdObjSpaceMultiMethod('uint_w', 1, []) # returns an unwrapped unsigned int (r_uint)
+ marshal_w = StdObjSpaceMultiMethod('marshal_w', 1, [], extra_args=['marshaller'])
+ log = StdObjSpaceMultiMethod('log', 1, [], extra_args=['base'])
# add all regular multimethods here
for _name, _symbol, _arity, _specialnames in ObjSpace.MethodTable:
if _name not in locals():
- mm = StdObjspaceMultiMethod(_symbol, _arity, _specialnames)
+ mm = StdObjSpaceMultiMethod(_symbol, _arity, _specialnames)
locals()[_name] = mm
del mm
Modified: pypy/dist/pypy/objspace/std/slicetype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/slicetype.py (original)
+++ pypy/dist/pypy/objspace/std/slicetype.py Thu Oct 27 01:43:41 2005
@@ -5,7 +5,7 @@
from pypy.interpreter.error import OperationError
# indices multimehtod
-slice_indices = StdObjspaceMultiMethod('indices', 2)
+slice_indices = StdObjSpaceMultiMethod('indices', 2)
# utility functions
def _Eval_SliceIndex(space, w_int):
Modified: pypy/dist/pypy/objspace/std/stdtypedef.py
==============================================================================
--- pypy/dist/pypy/objspace/std/stdtypedef.py (original)
+++ pypy/dist/pypy/objspace/std/stdtypedef.py Thu Oct 27 01:43:41 2005
@@ -3,13 +3,13 @@
from pypy.interpreter.typedef import TypeDef, GetSetProperty, Member
from pypy.interpreter.typedef import descr_get_dict, descr_set_dict
from pypy.interpreter.baseobjspace import SpaceCache
-from pypy.objspace.std.model import StdObjspaceMultiMethod
+from pypy.objspace.std.model import StdObjSpaceMultiMethod
from pypy.objspace.std.multimethod import FailedToImplement
from pypy.tool.sourcetools import compile2
__all__ = ['StdTypeDef', 'newmethod', 'gateway',
'GetSetProperty', 'Member',
- 'StdObjspaceMultiMethod', 'descr_get_dict']
+ 'StdObjSpaceMultiMethod', 'descr_get_dict']
class StdTypeDef(TypeDef):
@@ -93,7 +93,7 @@
"NOT_RPYTHON: initialization-time only."
result = []
for value in ns.itervalues():
- if isinstance(value, StdObjspaceMultiMethod):
+ if isinstance(value, StdObjSpaceMultiMethod):
result.append(value)
return result
Modified: pypy/dist/pypy/objspace/std/stringtype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/stringtype.py (original)
+++ pypy/dist/pypy/objspace/std/stringtype.py Thu Oct 27 01:43:41 2005
@@ -3,41 +3,41 @@
from sys import maxint
-str_join = StdObjspaceMultiMethod('join', 2)
-str_split = StdObjspaceMultiMethod('split', 3, defaults=(None,-1))
-str_rsplit = StdObjspaceMultiMethod('rsplit', 3, defaults=(None,-1))
-str_isdigit = StdObjspaceMultiMethod('isdigit', 1)
-str_isalpha = StdObjspaceMultiMethod('isalpha', 1)
-str_isspace = StdObjspaceMultiMethod('isspace', 1)
-str_isupper = StdObjspaceMultiMethod('isupper', 1)
-str_islower = StdObjspaceMultiMethod('islower', 1)
-str_istitle = StdObjspaceMultiMethod('istitle', 1)
-str_isalnum = StdObjspaceMultiMethod('isalnum', 1)
-str_ljust = StdObjspaceMultiMethod('ljust', 3, defaults=(' ',))
-str_rjust = StdObjspaceMultiMethod('rjust', 3, defaults=(' ',))
-str_upper = StdObjspaceMultiMethod('upper', 1)
-str_lower = StdObjspaceMultiMethod('lower', 1)
-str_swapcase = StdObjspaceMultiMethod('swapcase', 1)
-str_capitalize = StdObjspaceMultiMethod('capitalize', 1)
-str_title = StdObjspaceMultiMethod('title', 1)
-str_find = StdObjspaceMultiMethod('find', 4, defaults=(0, maxint))
-str_rfind = StdObjspaceMultiMethod('rfind', 4, defaults=(0, maxint))
-str_index = StdObjspaceMultiMethod('index', 4, defaults=(0, maxint))
-str_rindex = StdObjspaceMultiMethod('rindex', 4, defaults=(0, maxint))
-str_replace = StdObjspaceMultiMethod('replace', 4, defaults=(-1,))
-str_zfill = StdObjspaceMultiMethod('zfill', 2)
-str_strip = StdObjspaceMultiMethod('strip', 2, defaults=(None,))
-str_rstrip = StdObjspaceMultiMethod('rstrip', 2, defaults=(None,))
-str_lstrip = StdObjspaceMultiMethod('lstrip', 2, defaults=(None,))
-str_center = StdObjspaceMultiMethod('center', 3, defaults=(' ',))
-str_count = StdObjspaceMultiMethod('count', 4, defaults=(0, maxint))
-str_endswith = StdObjspaceMultiMethod('endswith', 4, defaults=(0, maxint))
-str_expandtabs = StdObjspaceMultiMethod('expandtabs', 2, defaults=(8,))
-str_splitlines = StdObjspaceMultiMethod('splitlines', 2, defaults=(0,))
-str_startswith = StdObjspaceMultiMethod('startswith', 4, defaults=(0, maxint))
-str_translate = StdObjspaceMultiMethod('translate', 3, defaults=('',)) #unicode mimic not supported now
-str_decode = StdObjspaceMultiMethod('decode', 3, defaults=(None, None))
-str_encode = StdObjspaceMultiMethod('encode', 3, defaults=(None, None))
+str_join = StdObjSpaceMultiMethod('join', 2)
+str_split = StdObjSpaceMultiMethod('split', 3, defaults=(None,-1))
+str_rsplit = StdObjSpaceMultiMethod('rsplit', 3, defaults=(None,-1))
+str_isdigit = StdObjSpaceMultiMethod('isdigit', 1)
+str_isalpha = StdObjSpaceMultiMethod('isalpha', 1)
+str_isspace = StdObjSpaceMultiMethod('isspace', 1)
+str_isupper = StdObjSpaceMultiMethod('isupper', 1)
+str_islower = StdObjSpaceMultiMethod('islower', 1)
+str_istitle = StdObjSpaceMultiMethod('istitle', 1)
+str_isalnum = StdObjSpaceMultiMethod('isalnum', 1)
+str_ljust = StdObjSpaceMultiMethod('ljust', 3, defaults=(' ',))
+str_rjust = StdObjSpaceMultiMethod('rjust', 3, defaults=(' ',))
+str_upper = StdObjSpaceMultiMethod('upper', 1)
+str_lower = StdObjSpaceMultiMethod('lower', 1)
+str_swapcase = StdObjSpaceMultiMethod('swapcase', 1)
+str_capitalize = StdObjSpaceMultiMethod('capitalize', 1)
+str_title = StdObjSpaceMultiMethod('title', 1)
+str_find = StdObjSpaceMultiMethod('find', 4, defaults=(0, maxint))
+str_rfind = StdObjSpaceMultiMethod('rfind', 4, defaults=(0, maxint))
+str_index = StdObjSpaceMultiMethod('index', 4, defaults=(0, maxint))
+str_rindex = StdObjSpaceMultiMethod('rindex', 4, defaults=(0, maxint))
+str_replace = StdObjSpaceMultiMethod('replace', 4, defaults=(-1,))
+str_zfill = StdObjSpaceMultiMethod('zfill', 2)
+str_strip = StdObjSpaceMultiMethod('strip', 2, defaults=(None,))
+str_rstrip = StdObjSpaceMultiMethod('rstrip', 2, defaults=(None,))
+str_lstrip = StdObjSpaceMultiMethod('lstrip', 2, defaults=(None,))
+str_center = StdObjSpaceMultiMethod('center', 3, defaults=(' ',))
+str_count = StdObjSpaceMultiMethod('count', 4, defaults=(0, maxint))
+str_endswith = StdObjSpaceMultiMethod('endswith', 4, defaults=(0, maxint))
+str_expandtabs = StdObjSpaceMultiMethod('expandtabs', 2, defaults=(8,))
+str_splitlines = StdObjSpaceMultiMethod('splitlines', 2, defaults=(0,))
+str_startswith = StdObjSpaceMultiMethod('startswith', 4, defaults=(0, maxint))
+str_translate = StdObjSpaceMultiMethod('translate', 3, defaults=('',)) #unicode mimic not supported now
+str_decode = StdObjSpaceMultiMethod('decode', 3, defaults=(None, None))
+str_encode = StdObjSpaceMultiMethod('encode', 3, defaults=(None, None))
# ____________________________________________________________
Modified: pypy/dist/pypy/objspace/std/unicodetype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/unicodetype.py (original)
+++ pypy/dist/pypy/objspace/std/unicodetype.py Thu Oct 27 01:43:41 2005
@@ -4,42 +4,42 @@
from sys import maxint
-unicode_capitalize = StdObjspaceMultiMethod('capitalize', 1)
-unicode_center = StdObjspaceMultiMethod('center', 3, defaults=(' ',))
-unicode_count = StdObjspaceMultiMethod('count', 4, defaults=(0, maxint))
-unicode_encode = StdObjspaceMultiMethod('encode', 3, defaults=(None, None))
-unicode_endswith = StdObjspaceMultiMethod('endswith', 4, defaults=(0,maxint))
-unicode_expandtabs = StdObjspaceMultiMethod('expandtabs', 2, defaults=(8,))
-unicode_find = StdObjspaceMultiMethod('find', 4, defaults=(0, maxint))
-unicode_index = StdObjspaceMultiMethod('index', 4, defaults=(0, maxint))
-unicode_isalnum = StdObjspaceMultiMethod('isalnum', 1)
-unicode_isalpha = StdObjspaceMultiMethod('isalpha', 1)
-unicode_isdecimal = StdObjspaceMultiMethod('isdecimal', 1)
-unicode_isdigit = StdObjspaceMultiMethod('isdigit', 1)
-unicode_islower = StdObjspaceMultiMethod('islower', 1)
-unicode_isnumeric = StdObjspaceMultiMethod('isnumeric', 1)
-unicode_isspace = StdObjspaceMultiMethod('isspace', 1)
-unicode_istitle = StdObjspaceMultiMethod('istitle', 1)
-unicode_isupper = StdObjspaceMultiMethod('isupper', 1)
-unicode_join = StdObjspaceMultiMethod('join', 2)
-unicode_ljust = StdObjspaceMultiMethod('ljust', 3, defaults=(' ',))
-unicode_lower = StdObjspaceMultiMethod('lower', 1)
-unicode_lstrip = StdObjspaceMultiMethod('lstrip', 2, defaults=(None,))
-unicode_replace = StdObjspaceMultiMethod('replace', 4, defaults=(-1,))
-unicode_rfind = StdObjspaceMultiMethod('rfind', 4, defaults=(0, maxint))
-unicode_rindex = StdObjspaceMultiMethod('rindex', 4, defaults=(0, maxint))
-unicode_rjust = StdObjspaceMultiMethod('rjust', 3, defaults=(' ',))
-unicode_rstrip = StdObjspaceMultiMethod('rstrip', 2, defaults=(None,))
-unicode_rsplit = StdObjspaceMultiMethod('rsplit', 3, defaults=(None,-1))
-unicode_split = StdObjspaceMultiMethod('split', 3, defaults=(None,-1))
-unicode_splitlines = StdObjspaceMultiMethod('splitlines', 2, defaults=(0,))
-unicode_startswith = StdObjspaceMultiMethod('startswith', 4, defaults=(0,maxint))
-unicode_strip = StdObjspaceMultiMethod('strip', 2, defaults=(None,))
-unicode_swapcase = StdObjspaceMultiMethod('swapcase', 1)
-unicode_title = StdObjspaceMultiMethod('title', 1)
-unicode_translate = StdObjspaceMultiMethod('translate', 2)
-unicode_upper = StdObjspaceMultiMethod('upper', 1)
-unicode_zfill = StdObjspaceMultiMethod('zfill', 2)
+unicode_capitalize = StdObjSpaceMultiMethod('capitalize', 1)
+unicode_center = StdObjSpaceMultiMethod('center', 3, defaults=(' ',))
+unicode_count = StdObjSpaceMultiMethod('count', 4, defaults=(0, maxint))
+unicode_encode = StdObjSpaceMultiMethod('encode', 3, defaults=(None, None))
+unicode_endswith = StdObjSpaceMultiMethod('endswith', 4, defaults=(0,maxint))
+unicode_expandtabs = StdObjSpaceMultiMethod('expandtabs', 2, defaults=(8,))
+unicode_find = StdObjSpaceMultiMethod('find', 4, defaults=(0, maxint))
+unicode_index = StdObjSpaceMultiMethod('index', 4, defaults=(0, maxint))
+unicode_isalnum = StdObjSpaceMultiMethod('isalnum', 1)
+unicode_isalpha = StdObjSpaceMultiMethod('isalpha', 1)
+unicode_isdecimal = StdObjSpaceMultiMethod('isdecimal', 1)
+unicode_isdigit = StdObjSpaceMultiMethod('isdigit', 1)
+unicode_islower = StdObjSpaceMultiMethod('islower', 1)
+unicode_isnumeric = StdObjSpaceMultiMethod('isnumeric', 1)
+unicode_isspace = StdObjSpaceMultiMethod('isspace', 1)
+unicode_istitle = StdObjSpaceMultiMethod('istitle', 1)
+unicode_isupper = StdObjSpaceMultiMethod('isupper', 1)
+unicode_join = StdObjSpaceMultiMethod('join', 2)
+unicode_ljust = StdObjSpaceMultiMethod('ljust', 3, defaults=(' ',))
+unicode_lower = StdObjSpaceMultiMethod('lower', 1)
+unicode_lstrip = StdObjSpaceMultiMethod('lstrip', 2, defaults=(None,))
+unicode_replace = StdObjSpaceMultiMethod('replace', 4, defaults=(-1,))
+unicode_rfind = StdObjSpaceMultiMethod('rfind', 4, defaults=(0, maxint))
+unicode_rindex = StdObjSpaceMultiMethod('rindex', 4, defaults=(0, maxint))
+unicode_rjust = StdObjSpaceMultiMethod('rjust', 3, defaults=(' ',))
+unicode_rstrip = StdObjSpaceMultiMethod('rstrip', 2, defaults=(None,))
+unicode_rsplit = StdObjSpaceMultiMethod('rsplit', 3, defaults=(None,-1))
+unicode_split = StdObjSpaceMultiMethod('split', 3, defaults=(None,-1))
+unicode_splitlines = StdObjSpaceMultiMethod('splitlines', 2, defaults=(0,))
+unicode_startswith = StdObjSpaceMultiMethod('startswith', 4, defaults=(0,maxint))
+unicode_strip = StdObjSpaceMultiMethod('strip', 2, defaults=(None,))
+unicode_swapcase = StdObjSpaceMultiMethod('swapcase', 1)
+unicode_title = StdObjSpaceMultiMethod('title', 1)
+unicode_translate = StdObjSpaceMultiMethod('translate', 2)
+unicode_upper = StdObjSpaceMultiMethod('upper', 1)
+unicode_zfill = StdObjSpaceMultiMethod('zfill', 2)
# ____________________________________________________________
More information about the Pypy-commit
mailing list