[Scipy-svn] r5446 - trunk/scipy/stsci/image/lib

[scipy-svn at scipy.org]

Author: chanley
Date: 2009-01-12 08:24:07 -0600 (Mon, 12 Jan 2009)
New Revision: 5446

Modified:
   trunk/scipy/stsci/image/lib/__init__.py
   trunk/scipy/stsci/image/lib/_image.py
   trunk/scipy/stsci/image/lib/combine.py
Log:
Fix imports for stsci.image

Modified: trunk/scipy/stsci/image/lib/__init__.py
===================================================================
--- trunk/scipy/stsci/image/lib/__init__.py	2009-01-12 09:50:54 UTC (rev 5445)
+++ trunk/scipy/stsci/image/lib/__init__.py	2009-01-12 14:24:07 UTC (rev 5446)
@@ -1,6 +1,6 @@
 import sys
-from _image import *
-from combine import *
+from scipy.stsci.image._image import *
+from scipy.stsci.image.combine import *
 
 __version__ = '2.0'
 

Modified: trunk/scipy/stsci/image/lib/_image.py
===================================================================
--- trunk/scipy/stsci/image/lib/_image.py	2009-01-12 09:50:54 UTC (rev 5445)
+++ trunk/scipy/stsci/image/lib/_image.py	2009-01-12 14:24:07 UTC (rev 5446)
@@ -1,6 +1,6 @@
 import numpy as np
-import convolve
-import convolve._correlate as _correlate
+from scipy.stsci import convolve
+from scipy.stsci.convolve import _correlate
 
 def _translate(a, dx, dy, output=None, mode="nearest", cval=0.0):
     """_translate does positive sub-pixel shifts using bilinear interpolation."""

Modified: trunk/scipy/stsci/image/lib/combine.py
===================================================================
--- trunk/scipy/stsci/image/lib/combine.py	2009-01-12 09:50:54 UTC (rev 5445)
+++ trunk/scipy/stsci/image/lib/combine.py	2009-01-12 14:24:07 UTC (rev 5446)
@@ -1,5 +1,5 @@
 import numpy as np
-from _combine import combine as _comb
+from scipy.stsci.image._combine import combine as _comb
 
 def _combine_f(funcstr, arrays, output=None, outtype=None, nlow=0, nhigh=0, badmasks=None):
     arrays = [ np.asarray(a) for a in arrays ]