Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r71169:2b304812a6bc
Date: 2014-05-01 17:34 -0700
http://bitbucket.org/pypy/pypy/changeset/2b304812a6bc/
Log: seqiter is good enough for default so kill our AraryIterator
diff --git a/pypy/module/array/interp_array.py
b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -517,9 +517,6 @@
# Misc methods
- def descr_iter(self, space):
- return space.wrap(ArrayIterator(self))
-
def descr_repr(self, space):
if self.len == 0:
return space.wrap("array('%s')" % self.typecode)
@@ -557,7 +554,6 @@
__radd__ = interp2app(W_ArrayBase.descr_radd),
__rmul__ = interp2app(W_ArrayBase.descr_rmul),
- __iter__ = interp2app(W_ArrayBase.descr_iter),
__repr__ = interp2app(W_ArrayBase.descr_repr),
itemsize = GetSetProperty(descr_itemsize),
@@ -665,28 +661,6 @@
return self.array._charbuf_start()
-class ArrayIterator(W_Root):
- def __init__(self, array):
- self.index = 0
- self.array = array
-
- def iter_w(self, space):
- return space.wrap(self)
-
- def next_w(self, space):
- if self.index < self.array.len:
- w_value = self.array.w_getitem(space, self.index)
- self.index += 1
- return w_value
- raise OperationError(space.w_StopIteration, space.w_None)
-
-ArrayIterator.typedef = TypeDef(
- 'arrayiterator',
- __iter__ = interp2app(ArrayIterator.iter_w),
- __next__ = interp2app(ArrayIterator.next_w),
- )
-
-
def make_array(mytype):
W_ArrayBase = globals()['W_ArrayBase']
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
