Changeset 12287:d7533ae4895e for sage/schemes/elliptic_curves/ell_rational_field.py

Timestamp:

05/19/09 16:11:30 (4 years ago)

Author:

Mike Hansen <mhansen@…>

Branch:

default

Message:

Updates for Pynac-0.1.7, main symbolics switch (#5930)

File:

• sage/schemes/elliptic_curves/ell_rational_field.py (modified) (3 diffs)

sage/schemes/elliptic_curves/ell_rational_field.py

@@ -54 +54 @@
 import sage.misc.misc as misc
 from sage.misc.all import verbose 
-import sage.functions.constants as constants
 import sage.modular.modform.constructor
 import sage.modular.modform.element
@@ -2855 +2854 @@
             -0.354172680517... + 0.874518681720...*I
         """
+        from sage.all import pi
+
         s = C(s)
         N = self.conductor()
-        pi = R(constants.pi)
-        from sage.calculus.calculus import gamma as Gamma
+        pi = R(pi)
+        from sage.functions.all import gamma as Gamma
         Gamma_inc = transcendental.gamma_inc
         a = self.anlist(prec)
@@ -5679 +5680 @@
             roots.remove(e3)
             e1,e2 = roots
- 
+
+        from sage.all import pi
         e = R(1).exp()
-        pi = R(constants.pi)
+        pi = R(pi)
 
         M = self.height_pairing_matrix(mw_base)