Ticket #11043: 11043-lazy-plot.patch

sage/all.py

@@ -1 +1 @@
 """
 all.py -- much of sage is imported into this module, so you don't
           have to import everything individually.
+          
+TESTS:
+
+Make sure numpy is not imported at startup::
+    
+    sage: os.system('''sage -c "assert 'numpy' not in sys.modules"''') == 0
+    True
 """
 
 from __future__ import with_statement
@@ -96 +103 @@
 from sage.functions.all  import *
 from sage.calculus.all   import *
 
-from sage.server.all     import *
+lazy_import("sage.server.all", "*", overwrite=False)
 import sage.tests.all as tests
 
 from sage.crypto.all     import *
 import sage.crypto.mq as mq
 
-from sage.plot.all       import *
-from sage.plot.plot3d.all     import *
+lazy_import("sage.plot.all", "*", overwrite=False)
+lazy_import("sage.plot.plot3d.all", "*", overwrite=False)
 
 from sage.coding.all     import *
 from sage.combinat.all   import *
 
 lazy_import("sage.lfunctions.all", "*", overwrite=False)
 
-from sage.geometry.all   import *
-from sage.geometry.triangulation.all   import *
+lazy_import("sage.geometry.all", "*", overwrite=False)
+lazy_import("sage.geometry.triangulation.all", "*", overwrite=False)
 
 from sage.homology.all   import *
 
 from sage.quadratic_forms.all import *
 
-from sage.gsl.all        import *
+lazy_import("sage.gsl.all", "*", overwrite=False)
 
 from sage.games.all      import *
 
@@ -130 +137 @@
 from sage.stats.all      import *
 import sage.stats.all as stats
 
-import sage.finance.all  as finance
+lazy_import("sage.finance", "all", "finance", overwrite=False)
 
 import sage.interacts as interacts
 

sage/calculus/all.py

@@ +1 @@
+from sage.misc.lazy_import import lazy_import
+
 from calculus import maxima as maxima_calculus
 from calculus import (laplace, inverse_laplace,
                       limit, lim)
@@ -15 +17 @@
 
 from var import (var, function, clear_vars)
 
-from riemann import Riemann_Map
-
-from interpolators import polygon_spline, complex_cubic_spline
+lazy_import('sage.calculus.riemann', 'Riemann_Map')
+lazy_import('sage.calculus.interpolators', ('polygon_spline', 'complex_cubic_spline'))
 
 from sage.modules.all import vector
 

sage/calculus/desolvers.py

@@ -57 +57 @@
 ##########################################################################
 
 from sage.interfaces.maxima import MaximaElement, Maxima
-from sage.plot.all import line
 from sage.symbolic.expression import is_SymbolicEquation
 from sage.symbolic.ring import is_SymbolicVariable
 from sage.calculus.functional import diff
@@ -1043 +1042 @@
         x00 = x01
         t00 = t00 + h
         soln.append([t00,x00,y00])
+    from sage.plot.all import line
     Q1 = line([[x[0],x[1]] for x in soln], rgbcolor=(1/4,1/8,3/4))
     Q2 = line([[x[0],x[2]] for x in soln], rgbcolor=(1/2,1/8,1/4))
     return [Q1,Q2]

sage/functions/prime_pi.pyx

@@ -28 +28 @@
 
 from sage.rings.integer import Integer
 from sage.rings.fast_arith import prime_range
-import sage.plot.all
 
 cdef extern from "math.h":
     double sqrt(double)

sage/functions/spike_function.py

@@ -2 +2 @@
 
 import math
 
-from sage.plot.all import line
 from sage.modules.free_module_element import vector
 from sage.rings.all import RDF
 
@@ -249 +248 @@
                     new_x = xmax
                 v.append( (new_x, 0) )
                 x = new_x
+        from sage.plot.all import line
         L = line(v, **kwds)
         L.xmin(xmin-1); L.xmax(xmax)
         return L

sage/functions/transcendental.py

@@ -37 +37 @@
 from sage.symbolic.function import GinacFunction, BuiltinFunction, is_inexact
 from sage.symbolic.ring import SR
 
-import sage.plot.all
-
 CC = complex_field.ComplexField()
 I = CC.gen(0)
 

sage/gsl/dwt.pyx

@@ -25 +25 @@
 
 #include 'gsl.pxi'
 
-import sage.plot.all
-
 #import gsl_array
 #cimport gsl_array
 
@@ -137 +135 @@
         cdef int i
         cdef double x
         v = []
-        point = sage.plot.all.point
+        from sage.plot.all import point
         if xmin == None:
             x_min = 0
         if xmax == None:

sage/gsl/fft.pyx

@@ -26 +26 @@
 
 include '../ext/stdsage.pxi'
 
-import sage.plot.all
-import sage.libs.pari.all
 from sage.rings.integer import Integer
 from sage.rings.complex_number import ComplexNumber
 
@@ -93 +91 @@
         cdef int i
         v = []
 
-        pari = sage.libs.pari.all.pari
-        point = sage.plot.all.point
+        from sage.libs.pari.all import pari
+        from sage.plot.all import point
         pi = pari('Pi')
         s = 1/(3*pi)   # so arg gets scaled between -1/3 and 1/3. 
 
@@ -115 +113 @@
         cdef double pr_x, x, h
         v = []
 
-        point = sage.plot.all.point
+        from sage.plot.all import point
 
         for i from xmin <= i < xmax:
             x = self.data[2*i]

sage/plot/all.py

@@ +1 @@
+import sage.misc.lazy_import
+assert sage.misc.lazy_import.check_lazy()
+
 from plot import (Graphics, plot,
                   graphics_array, 
                   list_plot, parametric_plot,

sage/stats/all.py

@@ +1 @@
+from sage.misc.lazy_import import lazy_import
+
 from r import (ttest)
 from basic_stats import (mean, mode, std, variance, median, moving_average)
 
-import hmm.all as hmm
+lazy_import("sage.stats.hmm", "all", "hmm")
 
-from sage.finance.time_series import TimeSeries
-from intlist import IntList
+lazy_import("sage.finance.time_series", "TimeSeries")
+lazy_import("sage.stats.intlist", "IntList")