Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67660:06c60b3386a5
Date: 2013-10-28 14:29 -0400
http://bitbucket.org/pypy/pypy/changeset/06c60b3386a5/
Log: random cleanups for micronumpy module
diff --git a/pypy/module/micronumpy/interp_boxes.py
b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -11,7 +11,6 @@
from rpython.rtyper.lltypesystem import rffi
from rpython.tool.sourcetools import func_with_new_name
from pypy.module.micronumpy.arrayimpl.voidbox import VoidBoxStorage
-from rpython.rlib.objectmodel import specialize
from pypy.interpreter.mixedmodule import MixedModule
from rpython.rtyper.lltypesystem import lltype
from rpython.rlib.rstring import StringBuilder
@@ -49,9 +48,6 @@
_mixin_ = True
def reduce(self, space):
- from rpython.rlib.rstring import StringBuilder
- from rpython.rtyper.lltypesystem import rffi, lltype
-
numpypy = space.getbuiltinmodule("_numpypy")
assert isinstance(numpypy, MixedModule)
multiarray = numpypy.get("multiarray")
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -1,15 +1,14 @@
from pypy.interpreter.error import operationerrfmt, OperationError
from pypy.interpreter.typedef import TypeDef, GetSetProperty,
make_weakref_descr
-from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault
+from pypy.interpreter.gateway import interp2app, unwrap_spec
from pypy.module.micronumpy.base import W_NDimArray, convert_to_array,\
ArrayArgumentException, issequence_w, wrap_impl
from pypy.module.micronumpy import interp_dtype, interp_ufuncs, interp_boxes,\
- interp_arrayops, iter
+ interp_arrayops
from pypy.module.micronumpy.strides import find_shape_and_elems,\
get_shape_from_iterable, to_coords, shape_agreement, \
shape_agreement_multiple
from pypy.module.micronumpy.interp_flatiter import W_FlatIterator
-from pypy.module.micronumpy.interp_support import unwrap_axis_arg
from pypy.module.micronumpy.appbridge import get_appbridge_cache
from pypy.module.micronumpy import loop
from pypy.module.micronumpy.dot import match_dot_shapes
@@ -904,7 +903,6 @@
raise OperationError(space.w_TypeError, space.wrap("only length-1
arrays can be converted to Python scalars"))
def descr_reduce(self, space):
- from rpython.rtyper.lltypesystem import rffi
from rpython.rlib.rstring import StringBuilder
from pypy.interpreter.mixedmodule import MixedModule
from pypy.module.micronumpy.arrayimpl.concrete import SliceArray
diff --git a/pypy/module/micronumpy/interp_ufuncs.py
b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -173,7 +173,6 @@
shapelen = len(obj_shape)
axis = unwrap_axis_arg(space, shapelen, w_axis)
assert axis >= 0
- size = obj.get_size()
dtype = interp_dtype.decode_w_dtype(space, dtype)
if dtype is None:
if self.comparison_func:
@@ -530,7 +529,6 @@
int64_dtype = interp_dtype.get_dtype_cache(space).w_int64dtype
complex_type = interp_dtype.get_dtype_cache(space).w_complex128dtype
float_type = interp_dtype.get_dtype_cache(space).w_float64dtype
- str_dtype = interp_dtype.get_dtype_cache(space).w_stringdtype
if isinstance(w_obj, interp_boxes.W_GenericBox):
dtype = w_obj.get_dtype(space)
if current_guess is None:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
