Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r80908:367dea44b661
Date: 2015-11-24 14:30 -0500
http://bitbucket.org/pypy/pypy/changeset/367dea44b661/
Log: merge heads
diff --git a/pypy/module/micronumpy/compile.py
b/pypy/module/micronumpy/compile.py
--- a/pypy/module/micronumpy/compile.py
+++ b/pypy/module/micronumpy/compile.py
@@ -8,6 +8,7 @@
from pypy.interpreter.error import OperationError
from rpython.rlib.objectmodel import specialize, instantiate
from rpython.rlib.nonconst import NonConstant
+from rpython.rlib.rarithmetic import base_int
from pypy.module.micronumpy import boxes, ufuncs
from pypy.module.micronumpy.arrayops import where
from pypy.module.micronumpy.ndarray import W_NDimArray
@@ -178,7 +179,7 @@
return BoolObject(obj)
elif isinstance(obj, int):
return IntObject(obj)
- elif isinstance(obj, long):
+ elif isinstance(obj, base_int):
return LongObject(obj)
elif isinstance(obj, W_Root):
return obj
@@ -196,31 +197,31 @@
return self.float(f)
def le(self, w_obj1, w_obj2):
- assert isinstance(w_obj1, boxes.W_GenericBox)
- assert isinstance(w_obj2, boxes.W_GenericBox)
+ assert isinstance(w_obj1, boxes.W_GenericBox)
+ assert isinstance(w_obj2, boxes.W_GenericBox)
return w_obj1.descr_le(self, w_obj2)
def lt(self, w_obj1, w_obj2):
- assert isinstance(w_obj1, boxes.W_GenericBox)
- assert isinstance(w_obj2, boxes.W_GenericBox)
+ assert isinstance(w_obj1, boxes.W_GenericBox)
+ assert isinstance(w_obj2, boxes.W_GenericBox)
return w_obj1.descr_lt(self, w_obj2)
def ge(self, w_obj1, w_obj2):
- assert isinstance(w_obj1, boxes.W_GenericBox)
- assert isinstance(w_obj2, boxes.W_GenericBox)
+ assert isinstance(w_obj1, boxes.W_GenericBox)
+ assert isinstance(w_obj2, boxes.W_GenericBox)
return w_obj1.descr_ge(self, w_obj2)
def add(self, w_obj1, w_obj2):
- assert isinstance(w_obj1, boxes.W_GenericBox)
- assert isinstance(w_obj2, boxes.W_GenericBox)
+ assert isinstance(w_obj1, boxes.W_GenericBox)
+ assert isinstance(w_obj2, boxes.W_GenericBox)
return w_obj1.descr_add(self, w_obj2)
def sub(self, w_obj1, w_obj2):
return self.wrap(1)
def mul(self, w_obj1, w_obj2):
- assert isinstance(w_obj1, boxes.W_GenericBox)
- assert isinstance(w_obj2, boxes.W_GenericBox)
+ assert isinstance(w_obj1, boxes.W_GenericBox)
+ assert isinstance(w_obj2, boxes.W_GenericBox)
return w_obj1.descr_mul(self, w_obj2)
def pow(self, w_obj1, w_obj2, _):
@@ -836,7 +837,7 @@
elif self.name == 'reshape':
w_arg = self.args[1]
assert isinstance(w_arg, ArrayConstant)
- order = -1
+ order = -1
w_res = arr.reshape(interp.space, w_arg.wrap(interp.space),
order)
else:
assert False
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
