testing: fixup failing jpl unit test infrastructure

astraw · astraw · commit 0df14b2a9186 · 2009-09-06T23:28:28.000Z
svn path=/trunk/matplotlib/; revision=7671
diff --git a/lib/matplotlib/testing/jpl_units/Duration.py b/lib/matplotlib/testing/jpl_units/Duration.py
@@ -100,7 +100,7 @@ def __add__( self, rhs ):
       - Returns the sum of ourselves and the input Duration.
       """
       # Delay-load due to circular dependencies.
-      import mplTest.units as U
+      import matplotlib.testing.jpl_units as U
 
       if isinstance( rhs, U.Epoch ):
          return rhs + self
diff --git a/lib/matplotlib/testing/jpl_units/Epoch.py b/lib/matplotlib/testing/jpl_units/Epoch.py
@@ -173,7 +173,7 @@ def __sub__( self, rhs ):
         Epoch that is the result of subtracting a duration from an epoch.
       """
       # Delay-load due to circular dependencies.
-      import mplTest.units as U
+      import matplotlib.testing.jpl_units as U
 
       # Handle Epoch - Duration
       if isinstance( rhs, U.Duration ):
diff --git a/lib/matplotlib/testing/jpl_units/EpochConverter.py b/lib/matplotlib/testing/jpl_units/EpochConverter.py
@@ -63,7 +63,7 @@ def float2epoch( value, unit ):
       - Returns the value converted to an Epoch in the sepcified time system.
       """
       # Delay-load due to circular dependencies.
-      import mplTest.units as U
+      import matplotlib.testing.jpl_units as U
 
       secPastRef = value * 86400.0 * U.UnitDbl( 1.0, 'sec' )
       return U.Epoch( unit, secPastRef, EpochConverter.jdRef )
@@ -111,7 +111,7 @@ def convert( value, unit, axis ):
       - Returns the value parameter converted to floats.
       """
       # Delay-load due to circular dependencies.
-      import mplTest.units as U
+      import matplotlib.testing.jpl_units as U
 
       isNotEpoch = True
       isDuration = False
diff --git a/test/mplTest/__init__.py b/test/mplTest/__init__.py
@@ -10,4 +10,4 @@
 from mplTest.MplNosePlugin import MplNosePlugin
 from mplTest.MplTestCase import MplTestCase
 
-import mplTest.units as units
+import matplotlib.testing.jpl_units as units
