Ticket #3869: sage-trac3869.patch

a/sage/databases/cremona.py

@@ -41 +41 @@
-import sage.schemes.elliptic_curves.constructor as elliptic
-import sage.databases.db   # very important that this be fully qualified
-import sage.misc.misc
+
+import re
+import string
-
-_map = {'allcurves':'a', 'degphi':'b', 'allbsd':'c', 'allgens':'d'}
-
@@ -245 +248 @@
-    #iso = iso.lower()
-    return conductor, iso, num
-
+def split_code(key):
+    """
+    Splits class+curve id string into its two parts.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-class LargeCremonaDatabase(sage.databases.db.Database):
-    """
@@ -466 +515 @@
-        """
-        for N in conductors:
-            K = self.allcurves(N).keys()
-
+cmp_code
-            for e in K:
-                yield self.elliptic_curve(str(N) + e)
-
@@ -481 +530 @@
-        classes = []
-        A = self.allcurves(conductor)
-        K = A.keys()
-
+cmp_code
-        for k in K:
-            v = A[k]
-            # test if not first curve in class
@@ -516 +565 @@
-            generator that iterates over EllipticCurve objects.
-        """
-        for N in conductors:
-
+
+
+
-                yield self.elliptic_curve(str(N) + id)
-
-    def list(self, conductors):