X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo%2Fcone%2Fall.py;h=e7d3bffcc4efccb3c145c354a06ecb27a789507e;hb=785d079a2f5faa5126685aea96d584c3fa9c3007;hp=00ceb9ead486d54b561ded31582afb065810d012;hpb=178baca085fbb21dc0f006d0953ffa43cdc9f2b1;p=sage.d.git

diff --git a/mjo/cone/all.py b/mjo/cone/all.py
index 00ceb9e..e7d3bff 100644
--- a/mjo/cone/all.py
+++ b/mjo/cone/all.py
@@ -2,16 +2,11 @@
 All imports from mjo.cone modules.
 """
 
-# 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.cone import *
 from mjo.cone.completely_positive import *
 from mjo.cone.doubly_nonnegative import *
 from mjo.cone.faces import *
+from mjo.cone.nonnegative_orthant import *
 from mjo.cone.permutation_invariant import *
 from mjo.cone.rearrangement import *
 from mjo.cone.symmetric_psd import *