Author: mattip <[email protected]>
Branch: missing-ndarray-attributes
Changeset: r60875:f2ead9283d4f
Date: 2013-02-04 22:52 +0200
http://bitbucket.org/pypy/pypy/changeset/f2ead9283d4f/
Log: merge default into branch
diff --git a/pypy/interpreter/pytraceback.py b/pypy/interpreter/pytraceback.py
--- a/pypy/interpreter/pytraceback.py
+++ b/pypy/interpreter/pytraceback.py
@@ -1,5 +1,6 @@
from pypy.interpreter import baseobjspace
from pypy.interpreter.error import OperationError
+
from rpython.tool.error import offset2lineno
@@ -27,10 +28,10 @@
def descr__reduce__(self, space):
from pypy.interpreter.mixedmodule import MixedModule
- w_mod = space.getbuiltinmodule('_pickle_support')
- mod = space.interp_w(MixedModule, w_mod)
+ w_mod = space.getbuiltinmodule('_pickle_support')
+ mod = space.interp_w(MixedModule, w_mod)
new_inst = mod.get('traceback_new')
- w = space.wrap
+ w = space.wrap
tup_base = []
tup_state = [
@@ -49,6 +50,7 @@
self.lasti = space.int_w(w_lasti)
self.next = space.interp_w(PyTraceback, w_next, can_be_None=True)
+
def record_application_traceback(space, operror, frame, last_instruction):
if frame.pycode.hidden_applevel:
return
@@ -56,10 +58,11 @@
tb = PyTraceback(space, frame, last_instruction, tb)
operror.set_traceback(tb)
+
def check_traceback(space, w_tb, msg):
from pypy.interpreter.typedef import PyTraceback
tb = space.interpclass_w(w_tb)
- if tb is None or not space.is_true(space.isinstance(tb,
+ if tb is None or not space.is_true(space.isinstance(tb,
space.gettypeobject(PyTraceback.typedef))):
raise OperationError(space.w_TypeError, space.wrap(msg))
return tb
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -1,18 +1,17 @@
-"""
+import py
-
-"""
-import py
-from pypy.interpreter.gateway import interp2app, BuiltinCode, unwrap_spec,\
- WrappedDefault
from pypy.interpreter.argument import Arguments
from pypy.interpreter.baseobjspace import Wrappable, DescrMismatch
from pypy.interpreter.error import OperationError, operationerrfmt
+from pypy.interpreter.gateway import (interp2app, BuiltinCode, unwrap_spec,
+ WrappedDefault)
+
+from rpython.rlib.jit import promote
+from rpython.rlib.objectmodel import compute_identity_hash, specialize
from rpython.tool.sourcetools import compile2, func_with_new_name
-from rpython.rlib.objectmodel import instantiate, compute_identity_hash,
specialize
-from rpython.rlib.jit import promote
-class TypeDef:
+
+class TypeDef(object):
def __init__(self, __name, __base=None, __total_ordering__=None,
**rawdict):
"NOT_RPYTHON: initialization-time only"
self.name = __name
@@ -27,7 +26,7 @@
self.weakrefable = '__weakref__' in rawdict
self.doc = rawdict.pop('__doc__', None)
for base in bases:
- self.hasdict |= base.hasdict
+ self.hasdict |= base.hasdict
self.weakrefable |= base.weakrefable
self.rawdict = {}
self.acceptable_as_base_class = '__new__' in rawdict
@@ -426,7 +425,7 @@
return unknown_objclass_getter, cls
miniglobals = {}
if isinstance(cls, str):
- assert cls.startswith('<'),"pythontype typecheck should begin with <"
+ assert cls.startswith('<'), "pythontype typecheck should begin with <"
cls_name = cls[1:]
typeexpr = "space.w_%s" % cls_name
else:
@@ -474,7 +473,7 @@
else:
try:
return self.fget(self, space, w_obj)
- except DescrMismatch, e:
+ except DescrMismatch:
return w_obj.descr_call_mismatch(
space, '__getattribute__',
self.reqcls, Arguments(space, [w_obj,
@@ -489,7 +488,7 @@
space.wrap("readonly attribute"))
try:
fset(self, space, w_obj, w_value)
- except DescrMismatch, e:
+ except DescrMismatch:
w_obj.descr_call_mismatch(
space, '__setattr__',
self.reqcls, Arguments(space, [w_obj,
@@ -505,7 +504,7 @@
space.wrap("cannot delete attribute"))
try:
fdel(self, space, w_obj)
- except DescrMismatch, e:
+ except DescrMismatch:
w_obj.descr_call_mismatch(
space, '__delattr__',
self.reqcls, Arguments(space, [w_obj,
@@ -546,6 +545,7 @@
class Member(Wrappable):
"""For slots."""
_immutable_ = True
+
def __init__(self, index, name, w_cls):
self.index = index
self.name = name
@@ -617,9 +617,8 @@
from pypy.interpreter.pyframe import PyFrame
from pypy.interpreter.pyopcode import SuspendedUnroller
from pypy.interpreter.module import Module
-from pypy.interpreter.function import Function, Method, StaticMethod
-from pypy.interpreter.function import ClassMethod
-from pypy.interpreter.function import BuiltinFunction, descr_function_get
+from pypy.interpreter.function import (Function, Method, StaticMethod,
+ ClassMethod, BuiltinFunction, descr_function_get)
from pypy.interpreter.pytraceback import PyTraceback
from pypy.interpreter.generator import GeneratorIterator
from pypy.interpreter.nestedscope import Cell
@@ -663,8 +662,10 @@
def fget_co_flags(space, code): # unwrapping through unwrap_spec
sig = code.signature()
flags = 0
- if sig.has_vararg(): flags |= CO_VARARGS
- if sig.has_kwarg(): flags |= CO_VARKEYWORDS
+ if sig.has_vararg():
+ flags |= CO_VARARGS
+ if sig.has_kwarg():
+ flags |= CO_VARKEYWORDS
return space.wrap(flags)
def fget_co_consts(space, code): # unwrapping through unwrap_spec
@@ -728,7 +729,7 @@
__eq__ = interp2app(PyCode.descr_code__eq__),
__ne__ = descr_generic_ne,
__hash__ = interp2app(PyCode.descr_code__hash__),
- __reduce__ = interp2app(PyCode.descr__reduce__),
+ __reduce__ = interp2app(PyCode.descr__reduce__),
__repr__ = interp2app(PyCode.repr),
co_argcount = interp_attrproperty('co_argcount', cls=PyCode),
co_nlocals = interp_attrproperty('co_nlocals', cls=PyCode),
@@ -737,9 +738,9 @@
co_code = interp_attrproperty('co_code', cls=PyCode),
co_consts = GetSetProperty(PyCode.fget_co_consts),
co_names = GetSetProperty(PyCode.fget_co_names),
- co_varnames = GetSetProperty(PyCode.fget_co_varnames),
- co_freevars = GetSetProperty(PyCode.fget_co_freevars),
- co_cellvars = GetSetProperty(PyCode.fget_co_cellvars),
+ co_varnames = GetSetProperty(PyCode.fget_co_varnames),
+ co_freevars = GetSetProperty(PyCode.fget_co_freevars),
+ co_cellvars = GetSetProperty(PyCode.fget_co_cellvars),
co_filename = interp_attrproperty('co_filename', cls=PyCode),
co_name = interp_attrproperty('co_name', cls=PyCode),
co_firstlineno = interp_attrproperty('co_firstlineno', cls=PyCode),
@@ -749,7 +750,7 @@
PyCode.typedef.acceptable_as_base_class = False
PyFrame.typedef = TypeDef('frame',
- __reduce__ = interp2app(PyFrame.descr__reduce__),
+ __reduce__ = interp2app(PyFrame.descr__reduce__),
__setstate__ = interp2app(PyFrame.descr__setstate__),
f_builtins = GetSetProperty(PyFrame.fget_f_builtins),
f_lineno = GetSetProperty(PyFrame.fget_f_lineno, PyFrame.fset_f_lineno),
@@ -827,9 +828,9 @@
__new__ = interp2app(Method.descr_method__new__.im_func),
__call__ = interp2app(Method.descr_method_call),
__get__ = interp2app(Method.descr_method_get),
- im_func = interp_attrproperty_w('w_function', cls=Method),
+ im_func = interp_attrproperty_w('w_function', cls=Method),
__func__ = interp_attrproperty_w('w_function', cls=Method),
- im_self = interp_attrproperty_w('w_instance', cls=Method),
+ im_self = interp_attrproperty_w('w_instance', cls=Method),
__self__ = interp_attrproperty_w('w_instance', cls=Method),
im_class = interp_attrproperty_w('w_class', cls=Method),
__getattribute__ = interp2app(Method.descr_method_getattribute),
@@ -886,7 +887,7 @@
def always_none(self, obj):
return None
-BuiltinFunction.typedef =
TypeDef("builtin_function",**Function.typedef.rawdict)
+BuiltinFunction.typedef = TypeDef("builtin_function",
**Function.typedef.rawdict)
BuiltinFunction.typedef.rawdict.update({
'__new__':
interp2app(BuiltinFunction.descr_builtinfunction__new__.im_func),
'__self__': GetSetProperty(always_none, cls=BuiltinFunction),
@@ -897,12 +898,12 @@
BuiltinFunction.typedef.acceptable_as_base_class = False
PyTraceback.typedef = TypeDef("traceback",
- __reduce__ = interp2app(PyTraceback.descr__reduce__),
+ __reduce__ = interp2app(PyTraceback.descr__reduce__),
__setstate__ = interp2app(PyTraceback.descr__setstate__),
- tb_frame = interp_attrproperty('frame', cls=PyTraceback),
- tb_lasti = interp_attrproperty('lasti', cls=PyTraceback),
+ tb_frame = interp_attrproperty('frame', cls=PyTraceback),
+ tb_lasti = interp_attrproperty('lasti', cls=PyTraceback),
tb_lineno = GetSetProperty(PyTraceback.descr_tb_lineno),
- tb_next = interp_attrproperty('next', cls=PyTraceback),
+ tb_next = interp_attrproperty('next', cls=PyTraceback),
)
PyTraceback.typedef.acceptable_as_base_class = False
@@ -937,12 +938,12 @@
Cell.typedef.acceptable_as_base_class = False
Ellipsis.typedef = TypeDef("Ellipsis",
- __repr__ = interp2app(Ellipsis.descr__repr__),
+ __repr__ = interp2app(Ellipsis.descr__repr__),
)
Ellipsis.typedef.acceptable_as_base_class = False
NotImplemented.typedef = TypeDef("NotImplemented",
- __repr__ = interp2app(NotImplemented.descr__repr__),
+ __repr__ = interp2app(NotImplemented.descr__repr__),
)
NotImplemented.typedef.acceptable_as_base_class = False
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -1,24 +1,23 @@
+from pypy.interpreter import gateway
+from pypy.interpreter.baseobjspace import W_Root
+from pypy.interpreter.error import OperationError, operationerrfmt
+from pypy.interpreter.function import Function, StaticMethod
+from pypy.interpreter.typedef import weakref_descr
from pypy.objspace.std.model import W_Object
from pypy.objspace.std.register_all import register_all
-from pypy.interpreter.function import Function, StaticMethod
-from pypy.interpreter import gateway
-from pypy.interpreter.error import OperationError, operationerrfmt
-from pypy.interpreter.typedef import weakref_descr
-from pypy.interpreter.baseobjspace import W_Root
from pypy.objspace.std.stdtypedef import std_dict_descr, issubtypedef, Member
-from pypy.objspace.std.objecttype import object_typedef
-from pypy.objspace.std import identitydict
-from rpython.rlib.objectmodel import we_are_translated
+
+from rpython.rlib.jit import (promote, elidable_promote, we_are_jitted,
+ promote_string, elidable, dont_look_inside, unroll_safe)
from rpython.rlib.objectmodel import current_object_addr_as_int, compute_hash
-from rpython.rlib.jit import promote, elidable_promote, we_are_jitted,\
- promote_string
-from rpython.rlib.jit import elidable, dont_look_inside, unroll_safe
from rpython.rlib.rarithmetic import intmask, r_uint
+
class TypeCell(W_Root):
def __init__(self, w_value=None):
self.w_value = w_value
+
def unwrap_cell(space, w_value):
if (space.config.objspace.std.withtypeversion and
isinstance(w_value, TypeCell)):
@@ -278,7 +277,7 @@
if attr in w_self.lazyloaders:
# very clever next line: it forces the attr string
# to be interned.
- w_attr = space.new_interned_str(attr)
+ space.new_interned_str(attr)
loader = w_self.lazyloaders[attr]
del w_self.lazyloaders[attr]
w_value = loader()
@@ -497,7 +496,7 @@
def get_module(w_self):
space = w_self.space
- if w_self.is_heaptype() and '__module__' in w_self.dict_w:
+ if w_self.is_heaptype() and w_self.getdictvalue(space, '__module__')
is not None:
return w_self.getdictvalue(space, '__module__')
else:
# for non-heap types, CPython checks for a module.name in the
@@ -516,7 +515,7 @@
mod = '__builtin__'
else:
mod = space.str_w(w_mod)
- if mod !='__builtin__':
+ if mod != '__builtin__':
return '%s.%s' % (mod, w_self.name)
else:
return w_self.name
@@ -560,13 +559,15 @@
subclasses_w.append(w_ob)
return subclasses_w
-
# for now, weakref support for W_TypeObject is hard to get automatically
_lifeline_ = None
+
def getweakref(self):
return self._lifeline_
+
def setweakref(self, space, weakreflifeline):
self._lifeline_ = weakreflifeline
+
def delweakref(self):
self._lifeline_ = None
@@ -693,9 +694,12 @@
else:
create_slot(w_self, slot_name)
wantdict = wantdict or hasoldstylebase
- if wantdict: create_dict_slot(w_self)
- if wantweakref: create_weakref_slot(w_self)
- if '__del__' in dict_w: w_self.needsdel = True
+ if wantdict:
+ create_dict_slot(w_self)
+ if wantweakref:
+ create_weakref_slot(w_self)
+ if '__del__' in dict_w:
+ w_self.needsdel = True
def create_slot(w_self, slot_name):
space = w_self.space
@@ -868,7 +872,7 @@
kind = 'type'
else:
kind = 'class'
- if mod is not None and mod !='__builtin__':
+ if mod is not None and mod != '__builtin__':
return space.wrap("<%s '%s.%s'>" % (kind, mod, w_obj.name))
else:
return space.wrap("<%s '%s'>" % (kind, w_obj.name))
@@ -887,7 +891,7 @@
# __get__(None, type): turns e.g. functions into unbound methods
return space.get(w_value, space.w_None, w_type)
if w_descr is not None:
- return space.get(w_descr,w_type)
+ return space.get(w_descr, w_type)
raise operationerrfmt(space.w_AttributeError,
"type object '%s' has no attribute '%s'",
w_type.name, name)
@@ -933,7 +937,7 @@
return mro_error(space, orderlists) # no candidate found
assert candidate not in order
order.append(candidate)
- for i in range(len(orderlists)-1, -1, -1):
+ for i in range(len(orderlists) - 1, -1, -1):
if orderlists[i][0] is candidate:
del orderlists[i][0]
if len(orderlists[i]) == 0:
diff --git a/pypy/objspace/std/typetype.py b/pypy/objspace/std/typetype.py
--- a/pypy/objspace/std/typetype.py
+++ b/pypy/objspace/std/typetype.py
@@ -1,5 +1,4 @@
from pypy.interpreter import gateway
-from pypy.interpreter.argument import Arguments
from pypy.interpreter.error import OperationError, operationerrfmt
from pypy.interpreter.typedef import (GetSetProperty, descr_get_dict,
weakref_descr)
@@ -90,9 +89,9 @@
return space.wrap(w_type.name)
def descr_set__name__(space, w_type, w_value):
- w_type = _check(space, w_type)
+ w_type = _check(space, w_type)
if not w_type.is_heaptype():
- raise operationerrfmt(space.w_TypeError,
+ raise operationerrfmt(space.w_TypeError,
"can't set %s.__name__", w_type.name)
w_type.name = space.str_w(w_value)
@@ -119,10 +118,9 @@
def descr_set__bases__(space, w_type, w_value):
# this assumes all app-level type objects are W_TypeObject
- from pypy.objspace.std.typeobject import W_TypeObject
- from pypy.objspace.std.typeobject import check_and_find_best_base
- from pypy.objspace.std.typeobject import get_parent_layout
- from pypy.objspace.std.typeobject import is_mro_purely_of_types
+ from pypy.objspace.std.typeobject import (W_TypeObject, get_parent_layout,
+ check_and_find_best_base, is_mro_purely_of_types)
+
w_type = _check(space, w_type)
if not w_type.is_heaptype():
raise operationerrfmt(space.w_TypeError,
@@ -213,9 +211,12 @@
#
w_type = _check(space, w_type)
flags = 0
- if w_type.flag_heaptype: flags |= _HEAPTYPE
- if w_type.flag_cpytype: flags |= _CPYTYPE
- if w_type.flag_abstract: flags |= _ABSTRACT
+ if w_type.flag_heaptype:
+ flags |= _HEAPTYPE
+ if w_type.flag_cpytype:
+ flags |= _CPYTYPE
+ if w_type.flag_abstract:
+ flags |= _ABSTRACT
return space.wrap(flags)
def descr_get__module(space, w_type):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
