SF.net SVN: matplotlib:[7671] trunk/matplotlib

[<as...@us...>]

Revision: 7671
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7671&view=rev
Author:   astraw
Date:     2009-09-06 23:28:28 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
testing: fixup failing jpl unit test infrastructure

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/testing/jpl_units/Duration.py
    trunk/matplotlib/lib/matplotlib/testing/jpl_units/Epoch.py
    trunk/matplotlib/lib/matplotlib/testing/jpl_units/EpochConverter.py
    trunk/matplotlib/test/mplTest/__init__.py

Modified: trunk/matplotlib/lib/matplotlib/testing/jpl_units/Duration.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/testing/jpl_units/Duration.py	2009-09-06 23:28:13 UTC (rev 7670)
+++ trunk/matplotlib/lib/matplotlib/testing/jpl_units/Duration.py	2009-09-06 23:28:28 UTC (rev 7671)
@@ -100,7 +100,7 @@
       - 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

Modified: trunk/matplotlib/lib/matplotlib/testing/jpl_units/Epoch.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/testing/jpl_units/Epoch.py	2009-09-06 23:28:13 UTC (rev 7670)
+++ trunk/matplotlib/lib/matplotlib/testing/jpl_units/Epoch.py	2009-09-06 23:28:28 UTC (rev 7671)
@@ -173,7 +173,7 @@
         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 ):

Modified: trunk/matplotlib/lib/matplotlib/testing/jpl_units/EpochConverter.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/testing/jpl_units/EpochConverter.py	2009-09-06 23:28:13 UTC (rev 7670)
+++ trunk/matplotlib/lib/matplotlib/testing/jpl_units/EpochConverter.py	2009-09-06 23:28:28 UTC (rev 7671)
@@ -63,7 +63,7 @@
       - 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 @@
       - 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

Modified: trunk/matplotlib/test/mplTest/__init__.py
===================================================================
--- trunk/matplotlib/test/mplTest/__init__.py	2009-09-06 23:28:13 UTC (rev 7670)
+++ trunk/matplotlib/test/mplTest/__init__.py	2009-09-06 23:28:28 UTC (rev 7671)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.