Changeset 7876:7dc2819cda5d

Timestamp:

12/23/07 08:02:26 (5 years ago)

Author:

Robert Miller <rlmillster@…>

Branch:

default

Tags:

2.9.1.rc3

Message:

random fixes for 2.9.1

Location:

sage

Files:

• libs/mwrank/all.py (modified) (1 diff)
• libs/mwrank/interface.py (modified) (1 diff)
• plot/plot.py (modified) (2 diffs)

sage/libs/mwrank/all.py

@@ -5 +5 @@
 __doc_exclude = []  # to include everything
 
-#from interface import (mwrank_EllipticCurve, mwrank_MordellWeil,
-#                       set_precision)
+from interface import (mwrank_EllipticCurve, mwrank_MordellWeil,
+                       set_precision)
 
-#from mwrank import initprimes as mwrank_initprimes
+from mwrank import initprimes as mwrank_initprimes
 
 
 
-mwrank_initprimes = mwrank_EllipticCurve = mwrank_MordellWeil = set_precision = ""

sage/libs/mwrank/interface.py

@@ -82 +82 @@
         """
         # import here to save time during startup (mwrank takes a while to init)
+
         from sage.libs.mwrank.mwrank import _Curvedata
-        
+
         if not isinstance(ainvs, list) and len(ainvs) <= 5:
             raise TypeError, "ainvs must be a list of length at most 5."

sage/plot/plot.py

@@ -1705 +1705 @@
         if coerce:
             for z in points:
-                if len(z) == 3:
+                if isinstance(z, (list,tuple)) and len(z) == 3:
                     return self._graphic3d()(points, coerce=coerce, **kwds)
                 xdata.append(float(z[0]))
@@ -1711 +1711 @@
         else:
             for z in points:
-                if len(z) == 3:
+                if isinstance(z, (list,tuple)) and len(z) == 3:
                     return self._graphic3d()(points, coerce=coerce, **kwds)
                 xdata.append(z[0])