Clean up some imports and fix another test failure.

[sage.d.git] / mjo / all.py

diff --git a/mjo/all.py b/mjo/all.py
index 580cca52bcea2d84db06c1ebef228074aecbc3ad..1a46f595739c3e115cb1f25018df286594363c45 100644 (file)
--- a/mjo/all.py
+++ b/mjo/all.py
@@ -3,15 +3,17 @@ Import all of the other code, so that the user doesn't have to do it
 in his script. Instead, he can just `from mjo.all import *`.
 """
 
-from cone.cone import *
-from cone.completely_positive import *
-from cone.doubly_nonnegative import *
-from cone.permutation_invariant import *
-from cone.rearrangement import *
-from cone.symmetric_psd import *
-from interpolation import *
-from misc import *
-from orthogonal_polynomials import *
-from plot import *
-from symbol_sequence import *
-from symbolic import *
+# Sage doesn't load ~/.sage/init.sage during testing (sage -t), so we
+# have to explicitly mangle our sitedir here so that "mjo.foo"
+# resolves.
+from os.path import abspath
+from site import addsitedir
+addsitedir(abspath('../'))
+
+from mjo.cone.all import *
+from mjo.interpolation import *
+from mjo.misc import *
+from mjo.orthogonal_polynomials import *
+from mjo.plot import *
+from mjo.symbol_sequence import *
+from mjo.symbolic import *