Author: Ronan Lamy <[email protected]>
Branch: py3k-update
Changeset: r84013:a5270742f467
Date: 2016-04-28 16:43 +0100
http://bitbucket.org/pypy/pypy/changeset/a5270742f467/
Log: rm more stray pypy2-isms
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1171,8 +1171,6 @@
return self.wrap(self.lookup(w_obj, "__call__") is not None)
def issequence_w(self, w_obj):
- if self.is_oldstyle_instance(w_obj):
- return (self.findattr(w_obj, self.wrap('__getitem__')) is not None)
flag = self.type(w_obj).flag_map_or_seq
if flag == 'M':
return False
@@ -1182,8 +1180,6 @@
return (self.lookup(w_obj, '__getitem__') is not None)
def ismapping_w(self, w_obj):
- if self.is_oldstyle_instance(w_obj):
- return (self.findattr(w_obj, self.wrap('__getitem__')) is not None)
flag = self.type(w_obj).flag_map_or_seq
if flag == 'M':
return True
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -148,7 +148,7 @@
py_memberdescr.c_d_member = w_obj.member
def memberdescr_realize(space, obj):
- # XXX NOT TESTED When is this ever called?
+ # XXX NOT TESTED When is this ever called?
member = rffi.cast(lltype.Ptr(PyMemberDef), obj)
w_type = from_ref(space, rffi.cast(PyObject, obj.c_ob_type))
w_obj = space.allocate_instance(W_MemberDescr, w_type)
@@ -405,8 +405,7 @@
# if a sequence or a mapping, then set the flag to force it
if pto.c_tp_as_sequence and pto.c_tp_as_sequence.c_sq_item:
self.flag_map_or_seq = 'S'
- elif (pto.c_tp_as_mapping and pto.c_tp_as_mapping.c_mp_subscript and
- not (pto.c_tp_as_sequence and pto.c_tp_as_sequence.c_sq_slice)):
+ elif pto.c_tp_as_mapping and pto.c_tp_as_mapping.c_mp_subscript:
self.flag_map_or_seq = 'M'
if pto.c_tp_doc:
self.w_doc = space.wrap(rffi.charp2str(pto.c_tp_doc))
@@ -627,7 +626,7 @@
if py_type.c_ob_type:
w_metatype = from_ref(space, rffi.cast(PyObject, py_type.c_ob_type))
- else:
+ else:
# Somehow the tp_base type is created with no ob_type, notably
# PyString_Type and PyBaseString_Type
# While this is a hack, cpython does it as well.
@@ -642,10 +641,10 @@
# inheriting tp_as_* slots
base = py_type.c_tp_base
if base:
- if not py_type.c_tp_as_number: py_type.c_tp_as_number =
base.c_tp_as_number
- if not py_type.c_tp_as_sequence: py_type.c_tp_as_sequence =
base.c_tp_as_sequence
- if not py_type.c_tp_as_mapping: py_type.c_tp_as_mapping =
base.c_tp_as_mapping
- if not py_type.c_tp_as_buffer: py_type.c_tp_as_buffer =
base.c_tp_as_buffer
+ if not py_type.c_tp_as_number: py_type.c_tp_as_number =
base.c_tp_as_number
+ if not py_type.c_tp_as_sequence: py_type.c_tp_as_sequence =
base.c_tp_as_sequence
+ if not py_type.c_tp_as_mapping: py_type.c_tp_as_mapping =
base.c_tp_as_mapping
+ if not py_type.c_tp_as_buffer: py_type.c_tp_as_buffer =
base.c_tp_as_buffer
return w_obj
diff --git a/pypy/module/operator/interp_operator.py
b/pypy/module/operator/interp_operator.py
--- a/pypy/module/operator/interp_operator.py
+++ b/pypy/module/operator/interp_operator.py
@@ -1,6 +1,5 @@
from pypy.interpreter.error import OperationError
from pypy.interpreter.gateway import unwrap_spec
-from pypy.module.__builtin__.interp_classobj import W_InstanceObject
def index(space, w_a):
@@ -207,12 +206,3 @@
@unwrap_spec(default=int)
def _length_hint(space, w_iterable, default):
return space.wrap(space.length_hint(w_iterable, default))
-
-
-def isMappingType(space, w_obj):
- 'isMappingType(a) -- Return True if a has a mapping type, False otherwise.'
- return space.wrap(space.ismapping_w(w_obj))
-
-def isSequenceType(space, w_obj):
- 'isSequenceType(a) -- Return True if a has a sequence type, False
otherwise.'
- return space.wrap(space.issequence_w(w_obj))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
