Author: Brian Kearns <[email protected]>
Branch: numpy-refactor
Changeset: r69492:758fa0da0cdd
Date: 2014-02-26 23:16 -0500
http://bitbucket.org/pypy/pypy/changeset/758fa0da0cdd/
Log: cleanup
diff --git a/pypy/module/micronumpy/interp_flatiter.py
b/pypy/module/micronumpy/interp_flatiter.py
--- a/pypy/module/micronumpy/interp_flatiter.py
+++ b/pypy/module/micronumpy/interp_flatiter.py
@@ -1,7 +1,7 @@
from pypy.module.micronumpy.base import W_NDimArray, convert_to_array
from pypy.module.micronumpy import loop
from pypy.module.micronumpy.concrete import BaseConcreteArray
-from pypy.interpreter.error import OperationError
+from pypy.interpreter.error import OperationError, oefmt
class FakeArrayImplementation(BaseConcreteArray):
@@ -23,6 +23,7 @@
assert isinstance(self.base(), W_NDimArray)
return self.base().create_iter()
+
class W_FlatIterator(W_NDimArray):
def __init__(self, arr):
self.base = arr
@@ -54,9 +55,8 @@
def descr_getitem(self, space, w_idx):
if not (space.isinstance_w(w_idx, space.w_int) or
- space.isinstance_w(w_idx, space.w_slice)):
- raise OperationError(space.w_IndexError,
- space.wrap('unsupported iterator index'))
+ space.isinstance_w(w_idx, space.w_slice)):
+ raise oefmt(space.w_IndexError, 'unsupported iterator index')
self.reset()
base = self.base
start, stop, step, length = space.decode_index4(w_idx, base.get_size())
@@ -70,9 +70,8 @@
def descr_setitem(self, space, w_idx, w_value):
if not (space.isinstance_w(w_idx, space.w_int) or
- space.isinstance_w(w_idx, space.w_slice)):
- raise OperationError(space.w_IndexError,
- space.wrap('unsupported iterator index'))
+ space.isinstance_w(w_idx, space.w_slice)):
+ raise oefmt(space.w_IndexError, 'unsupported iterator index')
base = self.base
start, stop, step, length = space.decode_index4(w_idx, base.get_size())
arr = convert_to_array(space, w_value)
diff --git a/pypy/module/micronumpy/test/test_numarray.py
b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -2303,8 +2303,12 @@
import numpy as np
a = np.array(1.5)
assert a[...] is a
+ #a[...] = 2.5
+ #assert a == 2.5
a = np.array([1, 2, 3])
assert a[...] is a
+ #a[...] = 4
+ #assert (a == [4, 4, 4]).all()
class AppTestNumArrayFromBuffer(BaseNumpyAppTest):
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -110,8 +110,6 @@
return dispatcher
class BaseType(object):
- SortRepr = None # placeholders for sorting classes, overloaded in sort.py
- Sort = None
_immutable_fields_ = ['native']
def __init__(self, native=True):
@@ -123,7 +121,6 @@
def malloc(self, size):
return alloc_raw_storage(size, track_allocation=False, zero=True)
-
class Primitive(object):
_mixin_ = True
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
