Author: Justin Peel <[email protected]>
Branch: unsigned-dtypes
Changeset: r47615:65355e14724b
Date: 2011-09-26 18:25 -0600
http://bitbucket.org/pypy/pypy/changeset/65355e14724b/
Log: change default dtype to be LongDtype for ints and as identity
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
@@ -234,15 +234,15 @@
w_type = space.type(w_obj)
bool_dtype = space.fromcache(interp_dtype.W_BoolDtype)
- int64_dtype = space.fromcache(interp_dtype.W_Int64Dtype)
+ long_dtype = space.fromcache(interp_dtype.W_LongDtype)
if space.is_w(w_type, space.w_bool):
if current_guess is None:
return bool_dtype
elif space.is_w(w_type, space.w_int):
if (current_guess is None or current_guess is bool_dtype or
- current_guess is int64_dtype):
- return int64_dtype
+ current_guess is long_dtype):
+ return long_dtype
return space.fromcache(interp_dtype.W_Float64Dtype)
@@ -308,7 +308,7 @@
identity = extra_kwargs.get("identity")
if identity is not None:
- identity =
space.fromcache(interp_dtype.W_Int64Dtype).adapt_val(identity)
+ identity =
space.fromcache(interp_dtype.W_LongDtype).adapt_val(identity)
extra_kwargs["identity"] = identity
func = ufunc_dtype_caller(space, ufunc_name, op_name, argcount,
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
