Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r58098:53cf1bf9fc14
Date: 2012-10-13 12:07 +0200
http://bitbucket.org/pypy/pypy/changeset/53cf1bf9fc14/
Log: merge
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
from pypy.objspace.std.register_all import register_all
from pypy.objspace.std.stdtypedef import StdTypeDef, SMM
@@ -163,9 +162,9 @@
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__),
+ __new__ = interp2app(descr__new__),
__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
