Author: Philip Jenvey <pjen...@underboss.org> Branch: py3k Changeset: r58092:448892c68233 Date: 2012-10-12 17:09 -0700 http://bitbucket.org/pypy/pypy/changeset/448892c68233/
Log: merge default diff --git a/pypy/module/oracle/interp_cursor.py b/pypy/module/oracle/interp_cursor.py --- a/pypy/module/oracle/interp_cursor.py +++ b/pypy/module/oracle/interp_cursor.py @@ -1,5 +1,4 @@ from pypy.interpreter.baseobjspace import Wrappable -from pypy.interpreter.gateway import NoneNotWrapped from pypy.interpreter.typedef import TypeDef, GetSetProperty from pypy.interpreter.typedef import interp_attrproperty, interp_attrproperty_w from pypy.interpreter.gateway import interp2app, unwrap_spec diff --git a/pypy/objspace/std/bytearraytype.py b/pypy/objspace/std/bytearraytype.py --- a/pypy/objspace/std/bytearraytype.py +++ b/pypy/objspace/std/bytearraytype.py @@ -1,7 +1,6 @@ -import sys -from pypy.interpreter import gateway from pypy.interpreter.baseobjspace import ObjSpace, W_Root from pypy.interpreter.error import OperationError +from pypy.interpreter.gateway import interp2app, unwrap_spec from pypy.objspace.std.register_all import register_all from pypy.objspace.std.stdtypedef import StdTypeDef, SMM @@ -62,9 +61,8 @@ def descr__new__(space, w_bytearraytype, __args__): return new_bytearray(space,w_bytearraytype, []) -@gateway.unwrap_spec(encoding='str_or_None', errors='str_or_None') -def descr__init__(space, w_self, w_source=gateway.NoneNotWrapped, - encoding=None, errors=None): +@unwrap_spec(encoding='str_or_None', errors='str_or_None') +def descr__init__(space, w_self, w_source=None, encoding=None, errors=None): from pypy.objspace.std.bytearrayobject import W_BytearrayObject assert isinstance(w_self, W_BytearrayObject) data = makebytesdata_w(space, w_source, encoding, errors) @@ -141,10 +139,10 @@ bytearray(sequence) -> bytearray initialized from sequence\'s items If the argument is a bytearray, the return value is the same object.''', - __new__ = gateway.interp2app(descr__new__), - __init__ = gateway.interp2app(descr__init__), + __new__ = interp2app(descr__new__), + __init__ = interp2app(descr__init__), __hash__ = None, - __reduce__ = gateway.interp2app(descr_bytearray__reduce__), - fromhex = gateway.interp2app(descr_fromhex, as_classmethod=True) + __reduce__ = interp2app(descr_bytearray__reduce__), + fromhex = interp2app(descr_fromhex, as_classmethod=True) ) bytearray_typedef.registermethods(globals()) _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit