Ticket #7535: trac_7535-errors-raise.patch

sage/geometry/polyhedra.py

@@ -1065 +1065 @@
         """
         if self.dim() > 4:
             print "Dimension is too large for wireframe"
-            return NotImplementedError
+            raise NotImplementedError
         if self.dim() < 4:
             if self.ieqs() == self.vertices() == []: 
                 return Graphics()

sage/groups/perm_gps/permgroup_named.py

@@ -964 +964 @@
         not a (smallish) "Hurwitz prime", an error message will be printed. 
         """
         if self.matrix_degree()!=2:
-            return ValueError, "Degree must be 2."
+            raise ValueError("Degree must be 2.")
         F = self.base_ring()
         q = F.order()           
         from sage.misc.misc import SAGE_EXTCODE
@@ -1007 +1007 @@
         randomness to the ordering of the characters.
         """
         if self.matrix_degree()!=2:
-            return ValueError, "Degree must be 2."
+            raise ValueError("Degree must be 2.")
         F = self.base_ring()
         q = F.order()           
         from sage.misc.misc import SAGE_EXTCODE

sage/interfaces/gap.py

@@ -574 +574 @@
         E = self._expect
         try:
             if len(line) > 4095:
-                raise RuntimeError,"Passing commands this long to gap would hang"
+                raise RuntimeError("Passing commands this long to gap would hang")
             E.sendline(line)
         except OSError:
-            return RuntimeError, "Error evaluating %s in %s"%(line, self)
+            raise RuntimeError("Error evaluating %s in %s"%(line, self))
         if wait_for_prompt == False:
             return ('','')
         if len(line)==0:
@@ -629 +629 @@
                     pass  # there is no need to do anything
         except pexpect.EOF:
             if not expect_eof:
-                raise RuntimeError, "Unexpected EOF from %s executing %s"%(self,line)
+                raise RuntimeError("Unexpected EOF from %s executing %s"%(self,line))
         except IOError:
-            raise RuntimeError, "IO Error from %s executing %s"%(self,line)
+            raise RuntimeError("IO Error from %s executing %s"%(self,line))
         return ("".join(normal_outputs),"".join(error_outputs))        
 
     def _keyboard_interrupt(self):

sage/modular/abvar/finite_subgroup.py

@@ -277 +277 @@
         A = self.abelian_variety()
         B = other.abelian_variety()
         if not A.in_same_ambient_variety(B):
-            return ValueError, "self and other must be in the same ambient Jacobian"
+            raise ValueError("self and other must be in the same ambient Jacobian")
         K = composite_field(self.field_of_definition(), other.field_of_definition())
         lattice = self.lattice() + other.lattice()
         if A != B:

sage/modular/arithgroup/congroup_gammaH.py

@@ -937 +937 @@
 
         from all import is_Gamma0, is_Gamma1
         if not isinstance(other, GammaH_class):
-            return NotImplementedError
+            raise NotImplementedError
 
         # level of self should divide level of other
         if self.level() % other.level():

sage/rings/finite_field_element.py

@@ -381 +381 @@
             return self.__multiplicative_order
         except AttributeError:
             if self.is_zero():
-                return ArithmeticError, "Multiplicative order of 0 not defined."
+                raise ArithmeticError("Multiplicative order of 0 not defined.")
             n = self.parent().order() - 1
             order = 1
             for p, e in arith.factor(n):

sage/rings/finite_field_givaro.pyx

@@ -1953 +1953 @@
             return self.__multiplicative_order
         else:
             if self.is_zero():
-                return ArithmeticError, "Multiplicative order of 0 not defined."
+                raise ArithmeticError("Multiplicative order of 0 not defined.")
             n = (parent_object(self)).order_c() - 1
             order = 1
             for p, e in sage.rings.arith.factor(n):

sage/schemes/elliptic_curves/ell_curve_isogeny.py

@@ -3990 +3990 @@
     j = QQ(j)
     if l != None:
         if not l.is_prime():
-            return ValueError, "%s is not prime."%l
+            raise ValueError("%s is not prime."%l)
         if not isog_table.has_key((l,j)):
             return []
         Ew = E.short_weierstrass_model()

sage/symbolic/expression_conversions.py

@@ -638 +638 @@
         if f_sympy:
             return f_sympy(*sympy.sympify(g))
         else:
-            return NotImplementedError("SymPy function '%s' doesn't exist" % f)
+            raise NotImplementedError("SymPy function '%s' doesn't exist" % f)
         
 sympy = SympyConverter()