Merge pull request #138 from bauen1/fix_vector_operators

Fix vector operators

Author: BruceSherwood

vpython/cyvector.pyx

@@ -62,23 +62,26 @@ cdef class vector(object):
         return '<{:.6g}, {:.6g}, {:.6g}>'.format(self._x, self._y, self._z)
 
     def __add__(self,other):
-        return vector(self._x + other._x, self._y + other._y, self._z + other._z)
+        if type(other) is vector:
+            return vector(self._x + other._x, self._y + other._y, self._z + other._z)
+        return NotImplemented
 
     def __truediv__(self, other): # Python 3, or Python 2 + future division
         if isinstance(other, (int, float)):
             return vector(self._x / other, self._y / other, self._z / other)
-        raise TypeError('a vector can only be divided by a scalar')
+        return NotImplemented
 
     def __sub__(self,other):
-        return vector(self._x - other._x, self._y - other._y, self._z - other._z)
+        if type(other) is vector:
+            return vector(self._x - other._x, self._y - other._y, self._z - other._z)
+        return NotImplemented
 
     def __mul__(self, other):  ## in cython order of arguments is arbitrary, rmul doesn't exist
         if isinstance(other, (int, float)):
             return vector(self._x * other, self._y * other, self._z * other)
         elif isinstance(self, (int, float)):
             return vector(self * other._x, self * other._y, self * other._z)
-        else:
-            raise TypeError('a vector can only be multiplied by a scalar', self, other)
+        return NotImplemented
 
     def __eq__(self,other):
         if type(self) is vector and type(other) is vector:

vpython/vector.py

@@ -53,29 +53,30 @@ def __str__(self):
     def __repr__(self):
         return '<{:.6g}, {:.6g}, {:.6g}>'.format(self._x, self._y, self._z)
 
-    def __add__(self,other):
-        return vector(self._x + other._x, self._y + other._y, self._z + other._z)
+    def __add__(self, other):
+        if type(other) is vector:
+            return vector(self._x + other._x, self._y + other._y, self._z + other._z)
+        return NotImplemented
 
-    def __sub__(self,other):
-        return vector(self._x - other._x, self._y - other._y, self._z - other._z)
+    def __sub__(self, other):
+        if type(other) is vector:
+            return vector(self._x - other._x, self._y - other._y, self._z - other._z)
+        return NotImplemented
 
     def __truediv__(self, other): # used by Python 3, and by Python 2 in the presence of __future__ division
-        try:
+        if isinstance(other, (float, int)):
             return vector(self._x / other, self._y / other, self._z / other)
-        except:
-            raise TypeError('a vector can only be divided by a scalar')
+        return NotImplemented
 
     def __mul__(self, other):
-        try:
+        if isinstance(other, (float, int)):
             return vector(self._x * other, self._y * other, self._z * other)
-        except:
-            raise TypeError('a vector can only be multiplied by a scalar')
+        return NotImplemented
 
     def __rmul__(self, other):
-        try:
+        if isinstance(other, (float, int)):
             return vector(self._x * other, self._y * other, self._z * other)
-        except:
-            raise TypeError('a vector can only be multiplied by a scalar')
+        return NotImplemented
 
     def __eq__(self,other):
         if type(self) is vector and type(other) is vector: