# HG changeset patch
# User William Stein <wstein@gmail.com>
# Date 1180565819 25200
# Node ID d2cd73f41a9746e53aff78cc00eb220f6274d1cd
# Parent  22b6f9a58b0fe2be5ffee27c7c8380c5c1c39de2
Only load predefines for command line and notebook, not for sage.all.

diff -r 22b6f9a58b0f -r d2cd73f41a97 sage/all_cmdline.py
--- a/sage/all_cmdline.py	Wed May 30 13:09:06 2007 -0700
+++ b/sage/all_cmdline.py	Wed May 30 15:56:59 2007 -0700
@@ -12,3 +12,5 @@ except ValueError, msg:
         msg = str(msg) + '\n\n** In SAGE, the easiest fix for this problem is to type "sage -ba"\n   to rebuild all the SageX code (this takes several minutes).\n   Alternatively, touch the last .pyx file in the traceback above. **\n'
     raise ValueError, msg
 
+
+from sage.calculus.predefined import *
diff -r 22b6f9a58b0f -r d2cd73f41a97 sage/all_notebook.py
--- a/sage/all_notebook.py	Wed May 30 13:09:06 2007 -0700
+++ b/sage/all_notebook.py	Wed May 30 15:56:59 2007 -0700
@@ -16,6 +16,8 @@ from sage.misc.html import html
 
 from sage.misc.sh import sh
 
+from sage.calculus.predefined import *
 
 
 
+
diff -r 22b6f9a58b0f -r d2cd73f41a97 sage/calculus/all.py
--- a/sage/calculus/all.py	Wed May 30 13:09:06 2007 -0700
+++ b/sage/calculus/all.py	Wed May 30 15:56:59 2007 -0700
@@ -24,54 +24,6 @@ from functional import (diff, derivative
 
 from var import (var, function, clear_vars)
 
-from predefined import (a,
-                      b,
-                      c,
-                      d,
-                      f,
-                      g,
-                      h,
-                      j,
-                      k,
-                      l,
-                      m,
-                      n,
-                      o,
-                      p,
-                      q,
-                      r,
-                      s,
-                      t,
-                      u,
-                      v,
-                      w,
-                      x,
-                      y,
-                      z,
-                      A,
-                      B,
-                      C,
-                      D,
-                      E,
-                      F,
-                      G,
-                      H,
-                      J,
-                      K,
-                      L,
-                      M,
-                      N,
-                      P,
-                      Q,
-                      R,
-                      S,
-                      T,
-                      U,
-                      V,
-                      W,
-                      X,
-                      Y,
-                      Z)
 
 def symbolic_expression(x):
     return SR(x)
diff -r 22b6f9a58b0f -r d2cd73f41a97 sage/calculus/predefined.py
--- a/sage/calculus/predefined.py	Wed May 30 13:09:06 2007 -0700
+++ b/sage/calculus/predefined.py	Wed May 30 15:56:59 2007 -0700
@@ -1,52 +1,52 @@ from calculus import var
-from calculus import var
+from calculus import var as _var
 
-a = var('a')
-b = var('b')
-c = var('c')
-d = var('d')
-f = var('f')
-g = var('g')
-h = var('h')
-j = var('j')
-k = var('k')
-l = var('l')
-m = var('m')
-n = var('n')
-o = var('o')
-p = var('p')
-q = var('q')
-r = var('r')
-s = var('s')
-t = var('t')
-u = var('u')
-v = var('v')
-w = var('w')
-x = var('x')
-y = var('y')
-z = var('z')
-A = var('A')
-B = var('B')
-C = var('C')
-D = var('D')
-E = var('E')
-F = var('F')
-G = var('G')
-H = var('H')
-J = var('J')
-K = var('K')
-L = var('L')
-M = var('M')
-N = var('N')
-O = var('O')
-P = var('P')
-Q = var('Q')
-R = var('R')
-S = var('S')
-T = var('T')
-U = var('U')
-V = var('V')
-W = var('W')
-X = var('X')
-Y = var('Y')
-Z = var('Z')
+a = _var('a')
+b = _var('b')
+c = _var('c')
+d = _var('d')
+f = _var('f')
+g = _var('g')
+h = _var('h')
+j = _var('j')
+k = _var('k')
+l = _var('l')
+m = _var('m')
+n = _var('n')
+o = _var('o')
+p = _var('p')
+q = _var('q')
+r = _var('r')
+s = _var('s')
+t = _var('t')
+u = _var('u')
+v = _var('v')
+w = _var('w')
+x = _var('x')
+y = _var('y')
+z = _var('z')
+A = _var('A')
+B = _var('B')
+C = _var('C')
+D = _var('D')
+E = _var('E')
+F = _var('F')
+G = _var('G')
+H = _var('H')
+J = _var('J')
+K = _var('K')
+L = _var('L')
+M = _var('M')
+N = _var('N')
+O = _var('O')
+P = _var('P')
+Q = _var('Q')
+R = _var('R')
+S = _var('S')
+T = _var('T')
+U = _var('U')
+V = _var('V')
+W = _var('W')
+X = _var('X')
+Y = _var('Y')
+Z = _var('Z')