diff -ur astropy-0.3.1/astropy/config/configuration.py astropy-0.3.1.six/astropy/config/configuration.py
--- astropy-0.3.1/astropy/config/configuration.py 2014-03-04 22:54:46.665079402 +0100
+++ astropy-0.3.1.six/astropy/config/configuration.py 2014-03-04 23:06:19.231057246 +0100
@@ -10,7 +10,7 @@
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
+import six
import inspect
import pkgutil
@@ -23,7 +23,7 @@
from os import path
from warnings import warn
-from ..extern import six
+import six
import configobj, validate
from ..utils.exceptions import AstropyWarning
diff -ur astropy-0.3.1/astropy/config/paths.py astropy-0.3.1.six/astropy/config/paths.py
--- astropy-0.3.1/astropy/config/paths.py 2014-03-04 22:54:46.662079378 +0100
+++ astropy-0.3.1.six/astropy/config/paths.py 2014-03-04 23:06:19.145056717 +0100
@@ -59,7 +59,7 @@
homedir = decodepath(os.path.join(os.environ['USERPROFILE']))
else:
try:
- from ..extern.six.moves import winreg as wreg
+ from six.moves import winreg as wreg
shell_folders = r'Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
key = wreg.OpenKey(wreg.HKEY_CURRENT_USER, shell_folders)
diff -ur astropy-0.3.1/astropy/constants/constant.py astropy-0.3.1.six/astropy/constants/constant.py
--- astropy-0.3.1/astropy/constants/constant.py 2014-03-04 22:54:46.672079456 +0100
+++ astropy-0.3.1.six/astropy/constants/constant.py 2014-03-04 23:06:19.526059061 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
+import six
import functools
import types
diff -ur astropy-0.3.1/astropy/constants/tests/test_constant.py astropy-0.3.1.six/astropy/constants/tests/test_constant.py
--- astropy-0.3.1/astropy/constants/tests/test_constant.py 2014-03-04 22:54:46.673079463 +0100
+++ astropy-0.3.1.six/astropy/constants/tests/test_constant.py 2014-03-04 23:06:19.598059504 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
from .. import Constant
from ...units import Quantity as Q
diff -ur astropy-0.3.1/astropy/coordinates/angles.py astropy-0.3.1.six/astropy/coordinates/angles.py
--- astropy-0.3.1/astropy/coordinates/angles.py 2014-03-04 22:54:46.553078536 +0100
+++ astropy-0.3.1.six/astropy/coordinates/angles.py 2014-03-04 23:06:14.724029536 +0100
@@ -12,7 +12,7 @@
import numpy as np
-from ..extern import six
+import six
from . import angle_utilities as util
from .. import units as u
from ..utils import deprecated
diff -ur astropy-0.3.1/astropy/coordinates/builtin_systems.py astropy-0.3.1.six/astropy/coordinates/builtin_systems.py
--- astropy-0.3.1/astropy/coordinates/builtin_systems.py 2014-03-04 22:54:46.550078512 +0100
+++ astropy-0.3.1.six/astropy/coordinates/builtin_systems.py 2014-03-04 23:06:14.636028995 +0100
@@ -12,7 +12,7 @@
import numpy as np
-from ..extern import six
+import six
from .angles import Angle
from .coordsystems import SphericalCoordinatesBase
from ..time import Time
diff -ur astropy-0.3.1/astropy/coordinates/coordsystems.py astropy-0.3.1.six/astropy/coordinates/coordsystems.py
--- astropy-0.3.1/astropy/coordinates/coordsystems.py 2014-03-04 22:54:46.549078505 +0100
+++ astropy-0.3.1.six/astropy/coordinates/coordsystems.py 2014-03-04 23:06:14.600028774 +0100
@@ -8,7 +8,7 @@
from abc import ABCMeta, abstractproperty, abstractmethod
-from ..extern import six
+import six
from .. import units as u
from .angles import Longitude, Latitude, Angle
from .distances import Distance, CartesianPoints, cartesian_to_spherical, spherical_to_cartesian
diff -ur astropy-0.3.1/astropy/coordinates/matching.py astropy-0.3.1.six/astropy/coordinates/matching.py
--- astropy-0.3.1/astropy/coordinates/matching.py 2014-03-04 22:54:46.562078605 +0100
+++ astropy-0.3.1.six/astropy/coordinates/matching.py 2014-03-04 23:06:15.209032516 +0100
@@ -8,7 +8,7 @@
import numpy as np
-from ..extern import six
+import six
__all__ = ['match_coordinates_3d', 'match_coordinates_sky']
diff -ur astropy-0.3.1/astropy/coordinates/name_resolve.py astropy-0.3.1.six/astropy/coordinates/name_resolve.py
--- astropy-0.3.1/astropy/coordinates/name_resolve.py 2014-03-04 22:54:46.554078543 +0100
+++ astropy-0.3.1.six/astropy/coordinates/name_resolve.py 2014-03-04 23:06:14.761029763 +0100
@@ -17,7 +17,7 @@
# Astropy
from ..config import ConfigurationItem
-from ..extern.six.moves import urllib
+from six.moves import urllib
from .. import units as u
from .builtin_systems import ICRS
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_api.py astropy-0.3.1.six/astropy/coordinates/tests/test_api.py
--- astropy-0.3.1/astropy/coordinates/tests/test_api.py 2014-03-04 22:54:46.557078567 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_api.py 2014-03-04 23:06:14.877030476 +0100
@@ -7,7 +7,7 @@
from ...tests.helper import pytest
raises = pytest.raises
-from ...extern import six
+import six
from ... import units as u
from ..errors import ConvertError, IllegalSecondError, IllegalMinuteError, IllegalHourError
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_arrays.py astropy-0.3.1.six/astropy/coordinates/tests/test_arrays.py
--- astropy-0.3.1/astropy/coordinates/tests/test_arrays.py 2014-03-04 22:54:46.558078574 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_arrays.py 2014-03-04 23:06:14.920030740 +0100
@@ -3,7 +3,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
from ...tests.helper import pytest
import numpy as np
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_formatting.py astropy-0.3.1.six/astropy/coordinates/tests/test_formatting.py
--- astropy-0.3.1/astropy/coordinates/tests/test_formatting.py 2014-03-04 22:54:46.555078551 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_formatting.py 2014-03-04 23:06:14.826030162 +0100
@@ -1,7 +1,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
from ...tests.helper import pytest
from ..angles import Angle
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_name_resolve.py astropy-0.3.1.six/astropy/coordinates/tests/test_name_resolve.py
--- astropy-0.3.1/astropy/coordinates/tests/test_name_resolve.py 2014-03-04 22:54:46.561078597 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_name_resolve.py 2014-03-04 23:06:15.154032178 +0100
@@ -14,7 +14,7 @@
from ..name_resolve import (get_icrs_coordinates, NameResolveError,
SESAME_DATABASE, _parse_response)
from ..builtin_systems import ICRS
-from ...extern.six.moves import urllib
+from six.moves import urllib
from ...tests.helper import remote_data, pytest
from ... import units as u
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_pickle.py astropy-0.3.1.six/astropy/coordinates/tests/test_pickle.py
--- astropy-0.3.1/astropy/coordinates/tests/test_pickle.py 2014-03-04 22:54:46.558078574 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_pickle.py 2014-03-04 23:06:14.935030832 +0100
@@ -1,4 +1,4 @@
-from ...extern.six.moves import cPickle as pickle
+from six.moves import cPickle as pickle
from ...coordinates import Longitude
def test_basic():
diff -ur astropy-0.3.1/astropy/coordinates/transformations.py astropy-0.3.1.six/astropy/coordinates/transformations.py
--- astropy-0.3.1/astropy/coordinates/transformations.py 2014-03-04 22:54:46.564078621 +0100
+++ astropy-0.3.1.six/astropy/coordinates/transformations.py 2014-03-04 23:06:15.250032768 +0100
@@ -11,7 +11,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
+import six
import heapq
import inspect
diff -ur astropy-0.3.1/astropy/io/fits/card.py astropy-0.3.1.six/astropy/io/fits/card.py
--- astropy-0.3.1/astropy/io/fits/card.py 2014-03-04 22:54:46.497078103 +0100
+++ astropy-0.3.1.six/astropy/io/fits/card.py 2014-03-04 23:06:13.059019307 +0100
@@ -11,7 +11,7 @@
from . import ENABLE_RECORD_VALUED_KEYWORD_CARDS, STRIP_HEADER_WHITESPACE
-from ...extern.six import string_types
+from six import string_types
from ...utils import deprecated
from ...utils.exceptions import AstropyUserWarning, AstropyDeprecationWarning
diff -ur astropy-0.3.1/astropy/io/fits/diff.py astropy-0.3.1.six/astropy/io/fits/diff.py
--- astropy-0.3.1/astropy/io/fits/diff.py 2014-03-04 22:54:46.517078257 +0100
+++ astropy-0.3.1.six/astropy/io/fits/diff.py 2014-03-04 23:06:13.582022519 +0100
@@ -21,7 +21,7 @@
import numpy as np
from ... import __version__
-from ...extern.six.moves import reduce
+from six.moves import reduce
from ...utils import indent
from .card import Card, BLANK_CARD
from .header import Header
diff -ur astropy-0.3.1/astropy/io/fits/file.py astropy-0.3.1.six/astropy/io/fits/file.py
--- astropy-0.3.1/astropy/io/fits/file.py 2014-03-04 22:54:46.538078420 +0100
+++ astropy-0.3.1.six/astropy/io/fits/file.py 2014-03-04 23:06:14.203026334 +0100
@@ -16,8 +16,8 @@
from .util import (isreadable, iswritable, isfile, fileobj_open, fileobj_name,
fileobj_closed, fileobj_mode, _array_from_file,
_array_to_file, _write_string, encode_ascii)
-from ...extern.six import PY3, b, string_types
-from ...extern.six.moves import urllib
+from six import PY3, b, string_types
+from six.moves import urllib
from ...utils.exceptions import AstropyUserWarning
diff -ur astropy-0.3.1/astropy/io/fits/fitsrec.py astropy-0.3.1.six/astropy/io/fits/fitsrec.py
--- astropy-0.3.1/astropy/io/fits/fitsrec.py 2014-03-04 22:54:46.536078404 +0100
+++ astropy-0.3.1.six/astropy/io/fits/fitsrec.py 2014-03-04 23:06:14.156026045 +0100
@@ -13,8 +13,8 @@
_AsciiColDefs, _FormatX, _FormatP, _VLF, _get_index,
_wrapx, _unwrapx, _makep, _convert_ascii_format, Delayed)
from .util import decode_ascii, encode_ascii
-from ...extern.six import string_types
-from ...extern.six.moves import xrange, map
+from six import string_types
+from six.moves import xrange, map
from ...utils import lazyproperty
from ...utils.exceptions import AstropyDeprecationWarning, AstropyUserWarning
diff -ur astropy-0.3.1/astropy/io/fits/hdu/compressed.py astropy-0.3.1.six/astropy/io/fits/hdu/compressed.py
--- astropy-0.3.1/astropy/io/fits/hdu/compressed.py 2014-03-04 22:54:46.506078172 +0100
+++ astropy-0.3.1.six/astropy/io/fits/hdu/compressed.py 2014-03-04 23:06:13.317020891 +0100
@@ -18,8 +18,8 @@
from ..header import Header
from ..util import _is_pseudo_unsigned, _unsigned_zero, _is_int
-from ....extern.six import string_types, iteritems
-from ....extern.six.moves import xrange
+from six import string_types, iteritems
+from six.moves import xrange
from ....utils import lazyproperty, deprecated
from ....utils.exceptions import (AstropyPendingDeprecationWarning,
AstropyUserWarning)
diff -ur astropy-0.3.1/astropy/io/fits/header.py astropy-0.3.1.six/astropy/io/fits/header.py
--- astropy-0.3.1/astropy/io/fits/header.py 2014-03-04 22:54:46.543078458 +0100
+++ astropy-0.3.1.six/astropy/io/fits/header.py 2014-03-04 23:06:14.346027213 +0100
@@ -15,8 +15,8 @@
from .util import (encode_ascii, decode_ascii, fileobj_mode, fileobj_closed,
fileobj_is_binary)
-from ...extern.six import PY3, string_types, itervalues, iteritems, next
-from ...extern.six.moves import zip, range
+from six import PY3, string_types, itervalues, iteritems, next
+from six.moves import zip, range
from ...utils import deprecated, isiterable
from ...utils.exceptions import AstropyUserWarning, AstropyDeprecationWarning
diff -ur astropy-0.3.1/astropy/io/fits/tests/test_header.py astropy-0.3.1.six/astropy/io/fits/tests/test_header.py
--- astropy-0.3.1/astropy/io/fits/tests/test_header.py 2014-03-04 22:54:46.526078327 +0100
+++ astropy-0.3.1.six/astropy/io/fits/tests/test_header.py 2014-03-04 23:06:13.863024245 +0100
@@ -11,7 +11,7 @@
from ....io import fits
from ....io.fits.verify import VerifyWarning
-from ....extern.six import u
+from six import u
from ....tests.helper import pytest, catch_warnings
from . import FitsTestCase
diff -ur astropy-0.3.1/astropy/io/fits/tests/test_table.py astropy-0.3.1.six/astropy/io/fits/tests/test_table.py
--- astropy-0.3.1/astropy/io/fits/tests/test_table.py 2014-03-04 22:54:46.533078381 +0100
+++ astropy-0.3.1.six/astropy/io/fits/tests/test_table.py 2014-03-04 23:06:14.042025345 +0100
@@ -3,7 +3,7 @@
import numpy as np
from numpy import char as chararray
-from ....extern.six.moves import range
+from six.moves import range
from ....io import fits
from ....tests.helper import pytest
diff -ur astropy-0.3.1/astropy/io/votable/connect.py astropy-0.3.1.six/astropy/io/votable/connect.py
--- astropy-0.3.1/astropy/io/votable/connect.py 2014-03-04 22:54:46.481077979 +0100
+++ astropy-0.3.1.six/astropy/io/votable/connect.py 2014-03-04 23:06:12.541016125 +0100
@@ -4,7 +4,7 @@
import os
-from ...extern import six
+import six
from . import parse, from_table
from .tree import VOTableFile, Table as VOTable
diff -ur astropy-0.3.1/astropy/io/votable/converters.py astropy-0.3.1.six/astropy/io/votable/converters.py
--- astropy-0.3.1/astropy/io/votable/converters.py 2014-03-04 22:54:46.478077956 +0100
+++ astropy-0.3.1.six/astropy/io/votable/converters.py 2014-03-04 23:06:12.465015658 +0100
@@ -5,8 +5,8 @@
"""
from __future__ import absolute_import, division, print_function, unicode_literals
-from ...extern import six
-from ...extern.six.moves import xrange
+import six
+from six.moves import xrange
# STDLIB
import re
diff -ur astropy-0.3.1/astropy/io/votable/exceptions.py astropy-0.3.1.six/astropy/io/votable/exceptions.py
--- astropy-0.3.1/astropy/io/votable/exceptions.py 2014-03-04 22:54:46.480077971 +0100
+++ astropy-0.3.1.six/astropy/io/votable/exceptions.py 2014-03-04 23:06:12.522016009 +0100
@@ -34,7 +34,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
# STDLIB
import io
diff -ur astropy-0.3.1/astropy/io/votable/table.py astropy-0.3.1.six/astropy/io/votable/table.py
--- astropy-0.3.1/astropy/io/votable/table.py 2014-03-04 22:54:46.482077987 +0100
+++ astropy-0.3.1.six/astropy/io/votable/table.py 2014-03-04 23:06:12.588016414 +0100
@@ -8,7 +8,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
# STDLIB
import io
diff -ur astropy-0.3.1/astropy/io/votable/tests/ucd_test.py astropy-0.3.1.six/astropy/io/votable/tests/ucd_test.py
--- astropy-0.3.1/astropy/io/votable/tests/ucd_test.py 2014-03-04 22:54:46.485078010 +0100
+++ astropy-0.3.1.six/astropy/io/votable/tests/ucd_test.py 2014-03-04 23:06:12.757017452 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import absolute_import, division, print_function, unicode_literals
-from ....extern import six
+import six
from ....tests.helper import raises
diff -ur astropy-0.3.1/astropy/io/votable/tests/vo_test.py astropy-0.3.1.six/astropy/io/votable/tests/vo_test.py
--- astropy-0.3.1/astropy/io/votable/tests/vo_test.py 2014-03-04 22:54:46.484078002 +0100
+++ astropy-0.3.1.six/astropy/io/votable/tests/vo_test.py 2014-03-04 23:06:12.681016985 +0100
@@ -4,8 +4,8 @@
"""
from __future__ import absolute_import, division, print_function, unicode_literals
-from ....extern import six
-from ....extern.six.moves import xrange
+import six
+from six.moves import xrange
# STDLIB
import difflib
diff -ur astropy-0.3.1/astropy/io/votable/tree.py astropy-0.3.1.six/astropy/io/votable/tree.py
--- astropy-0.3.1/astropy/io/votable/tree.py 2014-03-04 22:54:46.492078064 +0100
+++ astropy-0.3.1.six/astropy/io/votable/tree.py 2014-03-04 23:06:12.909018385 +0100
@@ -2,8 +2,8 @@
# TODO: Test FITS parsing
from __future__ import absolute_import, division, print_function, unicode_literals
-from ...extern import six
-from ...extern.six.moves import xrange, urllib
+import six
+from six.moves import xrange, urllib
# STDLIB
import base64
diff -ur astropy-0.3.1/astropy/io/votable/util.py astropy-0.3.1.six/astropy/io/votable/util.py
--- astropy-0.3.1/astropy/io/votable/util.py 2014-03-04 22:54:46.492078064 +0100
+++ astropy-0.3.1.six/astropy/io/votable/util.py 2014-03-04 23:06:12.946018613 +0100
@@ -4,7 +4,7 @@
"""
from __future__ import absolute_import, division, print_function, unicode_literals
-from ...extern import six
+import six
# STDLIB
import codecs
diff -ur astropy-0.3.1/astropy/io/votable/validator/html.py astropy-0.3.1.six/astropy/io/votable/validator/html.py
--- astropy-0.3.1/astropy/io/votable/validator/html.py 2014-03-04 22:54:46.475077933 +0100
+++ astropy-0.3.1.six/astropy/io/votable/validator/html.py 2014-03-04 23:06:12.356014989 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import absolute_import, division, print_function, unicode_literals
-from ....extern import six
-from ....extern.six.moves import xrange
+import six
+from six.moves import xrange
# STDLIB
import contextlib
diff -ur astropy-0.3.1/astropy/io/votable/validator/main.py astropy-0.3.1.six/astropy/io/votable/validator/main.py
--- astropy-0.3.1/astropy/io/votable/validator/main.py 2014-03-04 22:54:46.475077933 +0100
+++ astropy-0.3.1.six/astropy/io/votable/validator/main.py 2014-03-04 23:06:12.377015118 +0100
@@ -4,7 +4,7 @@
and generates a report as a directory tree of HTML files.
"""
from __future__ import absolute_import, division, print_function, unicode_literals
-from ....extern import six
+import six
# STDLIB
import os
diff -ur astropy-0.3.1/astropy/io/votable/validator/result.py astropy-0.3.1.six/astropy/io/votable/validator/result.py
--- astropy-0.3.1/astropy/io/votable/validator/result.py 2014-03-04 22:54:46.474077925 +0100
+++ astropy-0.3.1.six/astropy/io/votable/validator/result.py 2014-03-04 23:06:12.332014842 +0100
@@ -5,9 +5,9 @@
"""
from __future__ import absolute_import, division, print_function, unicode_literals
-from ....extern import six
-from ....extern.six.moves import http_client, urllib
-from ....extern.six.moves import cPickle as pickle
+import six
+from six.moves import http_client, urllib
+from six.moves import cPickle as pickle
# STDLIB
from xml.parsers.expat import ExpatError
diff -ur astropy-0.3.1/astropy/stats/funcs.py astropy-0.3.1.six/astropy/stats/funcs.py
--- astropy-0.3.1/astropy/stats/funcs.py 2014-03-04 22:54:46.414077461 +0100
+++ astropy-0.3.1.six/astropy/stats/funcs.py 2014-03-04 23:06:09.886999832 +0100
@@ -13,7 +13,7 @@
import numpy as np
-from ..extern.six.moves import xrange
+from six.moves import xrange
__all__ = ['sigma_clip', 'binom_conf_interval', 'binned_binom_proportion',
diff -ur astropy-0.3.1/astropy/table/groups.py astropy-0.3.1.six/astropy/table/groups.py
--- astropy-0.3.1/astropy/table/groups.py 2014-03-04 22:54:46.417077484 +0100
+++ astropy-0.3.1.six/astropy/table/groups.py 2014-03-04 23:06:09.985000433 +0100
@@ -1,7 +1,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import zip as izip
+import six
+from six.moves import zip as izip
import platform
import warnings
diff -ur astropy-0.3.1/astropy/table/__init__.py astropy-0.3.1.six/astropy/table/__init__.py
--- astropy-0.3.1/astropy/table/__init__.py 2014-03-04 22:54:46.423077530 +0100
+++ astropy-0.3.1.six/astropy/table/__init__.py 2014-03-04 23:06:10.126001299 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
+import six
from .table import Column, Table, TableColumns, Row, MaskedColumn
from .np_utils import TableMergeError
diff -ur astropy-0.3.1/astropy/table/np_utils.py astropy-0.3.1.six/astropy/table/np_utils.py
--- astropy-0.3.1/astropy/table/np_utils.py 2014-03-04 22:54:46.416077476 +0100
+++ astropy-0.3.1.six/astropy/table/np_utils.py 2014-03-04 23:06:09.961000286 +0100
@@ -10,8 +10,8 @@
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import zip as izip
+import six
+from six.moves import zip as izip
from itertools import chain
import collections
diff -ur astropy-0.3.1/astropy/table/operations.py astropy-0.3.1.six/astropy/table/operations.py
--- astropy-0.3.1/astropy/table/operations.py 2014-03-04 22:54:46.422077523 +0100
+++ astropy-0.3.1.six/astropy/table/operations.py 2014-03-04 23:06:10.093001096 +0100
@@ -8,7 +8,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
+import six
from copy import deepcopy
import warnings
diff -ur astropy-0.3.1/astropy/table/pprint.py astropy-0.3.1.six/astropy/table/pprint.py
--- astropy-0.3.1/astropy/table/pprint.py 2014-03-04 22:54:46.415077469 +0100
+++ astropy-0.3.1.six/astropy/table/pprint.py 2014-03-04 23:06:09.930000096 +0100
@@ -1,10 +1,10 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six import text_type
-from ..extern.six.moves import zip as izip
-from ..extern.six.moves import xrange
+import six
+from six import text_type
+from six.moves import zip as izip
+from six.moves import xrange
import os
import sys
diff -ur astropy-0.3.1/astropy/table/table.py astropy-0.3.1.six/astropy/table/table.py
--- astropy-0.3.1/astropy/table/table.py 2014-03-04 22:54:46.421077515 +0100
+++ astropy-0.3.1.six/astropy/table/table.py 2014-03-04 23:06:10.070000955 +0100
@@ -2,9 +2,9 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import zip as izip
-from ..extern.six.moves import range as xrange
+import six
+from six.moves import zip as izip
+from six.moves import range as xrange
import abc
import collections
diff -ur astropy-0.3.1/astropy/table/tests/test_pickle.py astropy-0.3.1.six/astropy/table/tests/test_pickle.py
--- astropy-0.3.1/astropy/table/tests/test_pickle.py 2014-03-04 22:54:46.429077577 +0100
+++ astropy-0.3.1.six/astropy/table/tests/test_pickle.py 2014-03-04 23:06:10.397002962 +0100
@@ -1,4 +1,4 @@
-from ...extern.six.moves import cPickle as pickle
+from six.moves import cPickle as pickle
import numpy as np
import pytest
diff -ur astropy-0.3.1/astropy/table/tests/test_pprint.py astropy-0.3.1.six/astropy/table/tests/test_pprint.py
--- astropy-0.3.1/astropy/table/tests/test_pprint.py 2014-03-04 22:54:46.428077569 +0100
+++ astropy-0.3.1.six/astropy/table/tests/test_pprint.py 2014-03-04 23:06:10.352002686 +0100
@@ -5,7 +5,7 @@
from ...tests.helper import pytest
from ... import table
from ...table import pprint
-from ...extern.six import PY3
+from six import PY3
BIG_WIDE_ARR = np.arange(2000, dtype=np.float).reshape(100, 20)
SMALL_ARR = np.arange(12, dtype=np.int).reshape(4, 3)
diff -ur astropy-0.3.1/astropy/table/tests/test_table.py astropy-0.3.1.six/astropy/table/tests/test_table.py
--- astropy-0.3.1/astropy/table/tests/test_table.py 2014-03-04 22:54:46.432077600 +0100
+++ astropy-0.3.1.six/astropy/table/tests/test_table.py 2014-03-04 23:06:10.490003533 +0100
@@ -9,7 +9,7 @@
import numpy as np
-from ...extern import six
+import six
from ...tests.helper import pytest, assert_follows_unicode_guidelines
from ... import table
from ... import units as u
diff -ur astropy-0.3.1/astropy/tests/helper.py astropy-0.3.1.six/astropy/tests/helper.py
--- astropy-0.3.1/astropy/tests/helper.py 2014-03-04 22:54:46.659079355 +0100
+++ astropy-0.3.1.six/astropy/tests/helper.py 2014-03-04 23:06:18.909055265 +0100
@@ -6,8 +6,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import cPickle as pickle
+import six
+from six.moves import cPickle as pickle
import errno
import shlex
@@ -528,7 +528,7 @@
If not provided, no roundtrip testing will be performed.
"""
from .. import UNICODE_OUTPUT
- from ..extern import six
+ import six
UNICODE_OUTPUT.set(False)
diff -ur astropy-0.3.1/astropy/tests/pytest_plugins.py astropy-0.3.1.six/astropy/tests/pytest_plugins.py
--- astropy-0.3.1/astropy/tests/pytest_plugins.py 2014-03-04 22:54:46.662079378 +0100
+++ astropy-0.3.1.six/astropy/tests/pytest_plugins.py 2014-03-04 23:06:19.110056502 +0100
@@ -5,8 +5,8 @@
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import filter
+import six
+from six.moves import filter
import doctest
import fnmatch
diff -ur astropy-0.3.1/astropy/tests/tests/test_imports.py astropy-0.3.1.six/astropy/tests/tests/test_imports.py
--- astropy-0.3.1/astropy/tests/tests/test_imports.py 2014-03-04 22:54:46.661079371 +0100
+++ astropy-0.3.1.six/astropy/tests/tests/test_imports.py 2014-03-04 23:06:19.026055985 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
import pkgutil
import os
diff -ur astropy-0.3.1/astropy/time/core.py astropy-0.3.1.six/astropy/time/core.py
--- astropy-0.3.1/astropy/time/core.py 2014-03-04 22:54:46.668079425 +0100
+++ astropy-0.3.1.six/astropy/time/core.py 2014-03-04 23:06:19.308057720 +0100
@@ -20,7 +20,7 @@
from .. import units as u
from ..utils import deprecated, deprecated_attribute
from ..utils.compat.misc import override__dir__
-from ..extern import six
+import six
__all__ = ['Time', 'TimeDelta', 'TimeFormat', 'TimeJD', 'TimeMJD',
'TimeFromEpoch', 'TimeUnix', 'TimeCxcSec', 'TimeGPS', 'TimePlotDate',
diff -ur astropy-0.3.1/astropy/units/core.py astropy-0.3.1.six/astropy/units/core.py
--- astropy-0.3.1/astropy/units/core.py 2014-03-04 22:54:46.641079216 +0100
+++ astropy-0.3.1.six/astropy/units/core.py 2014-03-04 23:06:18.222051040 +0100
@@ -7,8 +7,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import zip
+import six
+from six.moves import zip
import inspect
import sys
diff -ur astropy-0.3.1/astropy/units/format/cds.py astropy-0.3.1.six/astropy/units/format/cds.py
--- astropy-0.3.1/astropy/units/format/cds.py 2014-03-04 22:54:46.633079154 +0100
+++ astropy-0.3.1.six/astropy/units/format/cds.py 2014-03-04 23:06:17.908049109 +0100
@@ -12,8 +12,8 @@
import os
import re
-from ...extern import six
-from ...extern.six.moves import zip
+import six
+from six.moves import zip
from .base import Base
from . import utils
diff -ur astropy-0.3.1/astropy/units/format/fits.py astropy-0.3.1.six/astropy/units/format/fits.py
--- astropy-0.3.1/astropy/units/format/fits.py 2014-03-04 22:54:46.633079154 +0100
+++ astropy-0.3.1.six/astropy/units/format/fits.py 2014-03-04 23:06:17.927049225 +0100
@@ -6,7 +6,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern.six.moves import zip
+from six.moves import zip
import keyword
import warnings
diff -ur astropy-0.3.1/astropy/units/format/generic.py astropy-0.3.1.six/astropy/units/format/generic.py
--- astropy-0.3.1/astropy/units/format/generic.py 2014-03-04 22:54:46.635079170 +0100
+++ astropy-0.3.1.six/astropy/units/format/generic.py 2014-03-04 23:06:18.017049779 +0100
@@ -7,7 +7,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
import os
import re
diff -ur astropy-0.3.1/astropy/units/format/utils.py astropy-0.3.1.six/astropy/units/format/utils.py
--- astropy-0.3.1/astropy/units/format/utils.py 2014-03-04 22:54:46.632079146 +0100
+++ astropy-0.3.1.six/astropy/units/format/utils.py 2014-03-04 23:06:17.835048660 +0100
@@ -8,7 +8,7 @@
unicode_literals)
-from ...extern import six
+import six
from ...utils.compat.fractions import Fraction
diff -ur astropy-0.3.1/astropy/units/format/vounit.py astropy-0.3.1.six/astropy/units/format/vounit.py
--- astropy-0.3.1/astropy/units/format/vounit.py 2014-03-04 22:54:46.632079146 +0100
+++ astropy-0.3.1.six/astropy/units/format/vounit.py 2014-03-04 23:06:17.869048869 +0100
@@ -4,8 +4,8 @@
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
-from ...extern.six.moves import zip
+import six
+from six.moves import zip
import keyword
import warnings
diff -ur astropy-0.3.1/astropy/units/quantity.py astropy-0.3.1.six/astropy/units/quantity.py
--- astropy-0.3.1/astropy/units/quantity.py 2014-03-04 22:54:46.631079139 +0100
+++ astropy-0.3.1.six/astropy/units/quantity.py 2014-03-04 23:06:17.799048438 +0100
@@ -15,7 +15,7 @@
import numpy as np
# AstroPy
-from ..extern import six
+import six
from .core import (Unit, dimensionless_unscaled, UnitBase, UnitsError,
get_current_unit_registry)
from ..utils import lazyproperty
diff -ur astropy-0.3.1/astropy/units/tests/test_equivalencies.py astropy-0.3.1.six/astropy/units/tests/test_equivalencies.py
--- astropy-0.3.1/astropy/units/tests/test_equivalencies.py 2014-03-04 22:54:46.646079255 +0100
+++ astropy-0.3.1.six/astropy/units/tests/test_equivalencies.py 2014-03-04 23:06:18.393052092 +0100
@@ -12,7 +12,7 @@
from ...tests.helper import pytest
-from ...extern.six.moves import zip
+from six.moves import zip
from ... import units as u
diff -ur astropy-0.3.1/astropy/units/tests/test_quantity.py astropy-0.3.1.six/astropy/units/tests/test_quantity.py
--- astropy-0.3.1/astropy/units/tests/test_quantity.py 2014-03-04 22:54:46.648079270 +0100
+++ astropy-0.3.1.six/astropy/units/tests/test_quantity.py 2014-03-04 23:06:18.473052584 +0100
@@ -16,9 +16,9 @@
from ...tests.helper import raises, pytest
from ...utils import isiterable
from ... import units as u
-from ...extern.six.moves import xrange
-from ...extern.six.moves import cPickle as pickle
-from ...extern import six
+from six.moves import xrange
+from six.moves import cPickle as pickle
+import six
""" The Quantity class will represent a number + unit + uncertainty """
diff -ur astropy-0.3.1/astropy/units/tests/test_units.py astropy-0.3.1.six/astropy/units/tests/test_units.py
--- astropy-0.3.1/astropy/units/tests/test_units.py 2014-03-04 22:54:46.643079231 +0100
+++ astropy-0.3.1.six/astropy/units/tests/test_units.py 2014-03-04 23:06:18.306051556 +0100
@@ -12,8 +12,8 @@
import numpy as np
from numpy.testing.utils import assert_allclose
-from ...extern import six
-from ...extern.six.moves import cPickle as pickle
+import six
+from six.moves import cPickle as pickle
from ...tests.helper import pytest, raises, catch_warnings
from ...utils.compat.fractions import Fraction
diff -ur astropy-0.3.1/astropy/units/utils.py astropy-0.3.1.six/astropy/units/utils.py
--- astropy-0.3.1/astropy/units/utils.py 2014-03-04 22:54:46.628079116 +0100
+++ astropy-0.3.1.six/astropy/units/utils.py 2014-03-04 23:06:17.735048045 +0100
@@ -18,7 +18,7 @@
import numpy as np
from numpy import finfo
-from ..extern import six
+import six
from ..utils.compat.fractions import Fraction
from ..utils.exceptions import AstropyDeprecationWarning
diff -ur astropy-0.3.1/astropy/utils/compat/misc.py astropy-0.3.1.six/astropy/utils/compat/misc.py
--- astropy-0.3.1/astropy/utils/compat/misc.py 2014-03-04 22:54:46.607078953 +0100
+++ astropy-0.3.1.six/astropy/utils/compat/misc.py 2014-03-04 23:06:16.889042843 +0100
@@ -16,7 +16,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
import os
import sys
diff -ur astropy-0.3.1/astropy/utils/console.py astropy-0.3.1.six/astropy/utils/console.py
--- astropy-0.3.1/astropy/utils/console.py 2014-03-04 22:54:46.597078876 +0100
+++ astropy-0.3.1.six/astropy/utils/console.py 2014-03-04 23:06:16.367039634 +0100
@@ -51,8 +51,8 @@
_HAVE_IPYTHON = False
from ..config import ConfigurationItem
-from ..extern import six
-from ..extern.six.moves import range
+import six
+from six.moves import range
from .misc import deprecated, isiterable
diff -ur astropy-0.3.1/astropy/utils/data.py astropy-0.3.1.six/astropy/utils/data.py
--- astropy-0.3.1/astropy/utils/data.py 2014-03-04 22:54:46.616079023 +0100
+++ astropy-0.3.1.six/astropy/utils/data.py 2014-03-04 23:06:17.177044613 +0100
@@ -7,8 +7,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import urllib
+import six
+from six.moves import urllib
import atexit
import contextlib
diff -ur astropy-0.3.1/astropy/utils/metadata.py astropy-0.3.1.six/astropy/utils/metadata.py
--- astropy-0.3.1/astropy/utils/metadata.py 2014-03-04 22:54:46.597078876 +0100
+++ astropy-0.3.1.six/astropy/utils/metadata.py 2014-03-04 23:06:16.386039750 +0100
@@ -4,7 +4,7 @@
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
+import six
import warnings
diff -ur astropy-0.3.1/astropy/utils/misc.py astropy-0.3.1.six/astropy/utils/misc.py
--- astropy-0.3.1/astropy/utils/misc.py 2014-03-04 22:54:46.614079007 +0100
+++ astropy-0.3.1.six/astropy/utils/misc.py 2014-03-04 23:06:17.129044318 +0100
@@ -24,8 +24,8 @@
from .exceptions import AstropyDeprecationWarning, AstropyPendingDeprecationWarning
-from ..extern import six
-from ..extern.six.moves import urllib
+import six
+from six.moves import urllib
__all__ = ['find_current_module', 'isiterable', 'deprecated', 'lazyproperty',
diff -ur astropy-0.3.1/astropy/utils/tests/test_console.py astropy-0.3.1.six/astropy/utils/tests/test_console.py
--- astropy-0.3.1/astropy/utils/tests/test_console.py 2014-03-04 22:54:46.620079054 +0100
+++ astropy-0.3.1.six/astropy/utils/tests/test_console.py 2014-03-04 23:06:17.457046335 +0100
@@ -3,8 +3,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern.six import next
-from ...extern.six.moves import xrange
+from six import next
+from six.moves import xrange
import io
import locale
diff -ur astropy-0.3.1/astropy/utils/tests/test_data.py astropy-0.3.1.six/astropy/utils/tests/test_data.py
--- astropy-0.3.1/astropy/utils/tests/test_data.py 2014-03-04 22:54:46.620079054 +0100
+++ astropy-0.3.1.six/astropy/utils/tests/test_data.py 2014-03-04 23:06:17.437046212 +0100
@@ -2,7 +2,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
from ...tests.helper import remote_data, raises
@@ -301,7 +301,7 @@
checks that download_file gives a URLError and not an AttributeError,
as its code pathway involves some fiddling with the exception.
"""
- from ...extern.six.moves.urllib_error import URLError
+ from six.moves.urllib_error import URLError
from ..data import download_file
with pytest.raises(URLError):
diff -ur astropy-0.3.1/astropy/utils/tests/test_odict.py astropy-0.3.1.six/astropy/utils/tests/test_odict.py
--- astropy-0.3.1/astropy/utils/tests/test_odict.py 2014-03-04 22:54:46.617079030 +0100
+++ astropy-0.3.1.six/astropy/utils/tests/test_odict.py 2014-03-04 23:06:17.236044976 +0100
@@ -10,7 +10,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
import unittest
import inspect
diff -ur astropy-0.3.1/astropy/utils/tests/test_xml.py astropy-0.3.1.six/astropy/utils/tests/test_xml.py
--- astropy-0.3.1/astropy/utils/tests/test_xml.py 2014-03-04 22:54:46.618079038 +0100
+++ astropy-0.3.1.six/astropy/utils/tests/test_xml.py 2014-03-04 23:06:17.329045548 +0100
@@ -2,7 +2,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
import io
diff -ur astropy-0.3.1/astropy/utils/timer.py astropy-0.3.1.six/astropy/utils/timer.py
--- astropy-0.3.1/astropy/utils/timer.py 2014-03-04 22:54:46.600078899 +0100
+++ astropy-0.3.1.six/astropy/utils/timer.py 2014-03-04 23:06:16.514040537 +0100
@@ -4,8 +4,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import xrange, map
+import six
+from six.moves import xrange, map
# STDLIB
import time
diff -ur astropy-0.3.1/astropy/utils/xml/check.py astropy-0.3.1.six/astropy/utils/xml/check.py
--- astropy-0.3.1/astropy/utils/xml/check.py 2014-03-04 22:54:46.600078899 +0100
+++ astropy-0.3.1.six/astropy/utils/xml/check.py 2014-03-04 23:06:16.530040636 +0100
@@ -6,7 +6,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern.six.moves import xrange, urllib
+from six.moves import xrange, urllib
import re
diff -ur astropy-0.3.1/astropy/utils/xml/iterparser.py astropy-0.3.1.six/astropy/utils/xml/iterparser.py
--- astropy-0.3.1/astropy/utils/xml/iterparser.py 2014-03-04 22:54:46.601078907 +0100
+++ astropy-0.3.1.six/astropy/utils/xml/iterparser.py 2014-03-04 23:06:16.582040955 +0100
@@ -4,7 +4,7 @@
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
# STDLIB
import collections
diff -ur astropy-0.3.1/astropy/utils/xml/writer.py astropy-0.3.1.six/astropy/utils/xml/writer.py
--- astropy-0.3.1/astropy/utils/xml/writer.py 2014-03-04 22:54:46.602078914 +0100
+++ astropy-0.3.1.six/astropy/utils/xml/writer.py 2014-03-04 23:06:16.634041275 +0100
@@ -5,7 +5,7 @@
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
# STDLIB
import contextlib
diff -ur astropy-0.3.1/astropy/wcs/setup_package.py astropy-0.3.1.six/astropy/wcs/setup_package.py
--- astropy-0.3.1/astropy/wcs/setup_package.py 2014-03-04 22:54:46.592078837 +0100
+++ astropy-0.3.1.six/astropy/wcs/setup_package.py 2014-03-04 23:06:16.232038804 +0100
@@ -11,7 +11,7 @@
import sys
from astropy import setup_helpers
-from astropy.extern import six
+import six
WCSROOT = os.path.relpath(os.path.dirname(__file__))
WCSVERSION = "4.10"
diff -ur astropy-0.3.1/astropy/wcs/tests/test_pickle.py astropy-0.3.1.six/astropy/wcs/tests/test_pickle.py
--- astropy-0.3.1/astropy/wcs/tests/test_pickle.py 2014-03-04 22:54:46.590078822 +0100
+++ astropy-0.3.1.six/astropy/wcs/tests/test_pickle.py 2014-03-04 23:06:16.162038373 +0100
@@ -6,7 +6,7 @@
import numpy as np
from numpy.testing import assert_array_almost_equal
-from ...extern.six.moves import cPickle
+from six.moves import cPickle
from ...utils.data import get_pkg_data_contents, get_pkg_data_fileobj
from ...utils.misc import NumpyRNGContext
from ...io import fits
diff -ur astropy-0.3.1/astropy/wcs/tests/test_wcs.py astropy-0.3.1.six/astropy/wcs/tests/test_wcs.py
--- astropy-0.3.1/astropy/wcs/tests/test_wcs.py 2014-03-04 22:54:46.589078814 +0100
+++ astropy-0.3.1.six/astropy/wcs/tests/test_wcs.py 2014-03-04 23:06:16.129038170 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import absolute_import, division, print_function, unicode_literals
-from ...extern import six
+import six
import os
import sys
diff -ur astropy-0.3.1/astropy/wcs/wcs.py astropy-0.3.1.six/astropy/wcs/wcs.py
--- astropy-0.3.1/astropy/wcs/wcs.py 2014-03-04 22:54:46.595078860 +0100
+++ astropy-0.3.1.six/astropy/wcs/wcs.py 2014-03-04 23:06:16.327039388 +0100
@@ -39,7 +39,7 @@
import numpy as np
# LOCAL
-from ..extern import six
+import six
from ..io import fits
from . import _docutil as __
try: