eteq · Oct 25, 2013 · Aug 15, 2013 · Aug 16, 2013 · Aug 16, 2013 · Aug 16, 2013
diff --git a/astropy/convolution/tests/test_discretize.py b/astropy/convolution/tests/test_discretize.py
@@ -9,7 +9,7 @@
 from ...modeling.functional_models import (
     Gaussian1DModel, Box1DModel, MexicanHat1DModel, Trapezoid1DModel,
     Gaussian2DModel, Box2DModel, MexicanHat2DModel)
-from ...modeling.tests.model_lists import models_1D, models_2D
+from ...modeling.tests.example_models import models_1D, models_2D
 from ...modeling.tests.test_models import create_model
 
 try:

diff --git a/astropy/io/fits/diff.py b/astropy/io/fits/diff.py
@@ -30,11 +30,12 @@
 from numpy import char
 
 from ... import __version__
+from ...utils import indent
 from .card import Card, BLANK_CARD
 from .header import Header
 from .hdu.hdulist import fitsopen, HDUList
 from .hdu.table import _TableLikeHDU
-from .util import indent, u
+from .util import u
 
 
 __all__ = ['FITSDiff', 'HDUDiff', 'HeaderDiff', 'ImageDataDiff', 'RawDataDiff',

diff --git a/astropy/io/fits/hdu/hdulist.py b/astropy/io/fits/hdu/hdulist.py
@@ -18,9 +18,10 @@
 from ..file import PYTHON_MODES, _File
 from ..header import BLOCK_SIZE, _pad_length
 from ..util import (_is_int, _tmp_name, isfile, fileobj_name, fileobj_closed,
-                    fileobj_mode, ignore_sigint, _get_array_mmap, indent)
+                    fileobj_mode, ignore_sigint, _get_array_mmap)
 from ..verify import _Verify, _ErrList, VerifyError, VerifyWarning
 
+from ....utils import indent
 from ....utils.exceptions import AstropyUserWarning
 
 

diff --git a/astropy/io/fits/util.py b/astropy/io/fits/util.py
@@ -313,15 +313,6 @@ def translate(s, table, deletechars):
         return s.translate(table)
 
 
-def indent(s, shift=1, width=4):
-    indented = '\n'.join(' ' * (width * shift) + l if l else ''
-                         for l in s.splitlines())
-    if s[-1] == '\n':
-        indented += '\n'
-
-    return indented
-
-
 def fill(text, width, *args, **kwargs):
     """
     Like :func:`textwrap.wrap` but preserves existing paragraphs which

diff --git a/astropy/io/fits/verify.py b/astropy/io/fits/verify.py
@@ -2,7 +2,8 @@
 
 import warnings
 
-from .util import indent, u
+from .util import u
+from ...utils import indent
 from ...utils.exceptions import AstropyUserWarning
 
 

diff --git a/astropy/modeling/__init__.py b/astropy/modeling/__init__.py
@@ -5,10 +5,9 @@
 performing model evaluation and fitting. It supports 1D and 2D models
 and fitting with parameter constraints. It has some predefined models
 and fitting routines.
-
 """
 
+from . import fitting
 from . import models
 from .core import *
-from . import fitting
 from .parameters import *