cleanups

Author: jreback

pandas/core/api.py

@@ -11,7 +11,12 @@
 from pandas.io.formats.format import set_eng_float_format
 from pandas.core.index import (Index, CategoricalIndex, Int64Index,
                                UInt64Index, RangeIndex, Float64Index,
-                               MultiIndex, IntervalIndex)
+                               MultiIndex, IntervalIndex,
+                               TimedeltaIndex, DatetimeIndex,
+                               PeriodIndex, NaT)
+from pandas.core.indexes.period import Period, period_range, pnow
+from pandas.core.indexes.timedeltas import Timedelta, timedelta_range
+from pandas.core.indexes.datetimes import Timestamp, date_range, bdate_range
 from pandas.core.indexes.interval import Interval, interval_range
 
 from pandas.core.series import Series
@@ -26,10 +31,6 @@
 from pandas.core.dtypes.cast import to_numeric
 from pandas.tseries.offsets import DateOffset
 from pandas.tseries.tools import to_datetime
-from pandas.core.indexes.datetimes import (DatetimeIndex, Timestamp,
-                                  date_range, bdate_range)
-from pandas.core.indexes.timedeltas import TimedeltaIndex, Timedelta
-from pandas.core.indexes.period import Period, PeriodIndex
 from pandas.core.resample import TimeGrouper
 
 # see gh-14094.

pandas/core/indexes/api.py

@@ -7,16 +7,21 @@
 from pandas.core.indexes.numeric import (NumericIndex, Float64Index,  # noqa
                                     Int64Index, UInt64Index)
 from pandas.core.indexes.range import RangeIndex  # noqa
+from pandas.core.indexes.timedeltas import TimedeltaIndex
+from pandas.core.indexes.period import PeriodIndex
+from pandas.core.indexes.datetimes import DatetimeIndex
 
 import pandas.core.common as com
-import pandas._libs.lib as lib
+from pandas._libs import lib
+from pandas._libs.tslib import NaT
 
 # TODO: there are many places that rely on these private methods existing in
 # pandas.core.index
 __all__ = ['Index', 'MultiIndex', 'NumericIndex', 'Float64Index', 'Int64Index',
            'CategoricalIndex', 'IntervalIndex', 'RangeIndex', 'UInt64Index',
-           'InvalidIndexError',
-           '_new_Index',
+           'InvalidIndexError', 'TimedeltaIndex',
+           'PeriodIndex', 'DatetimeIndex',
+           '_new_Index', 'NaT',
            '_ensure_index', '_get_na_value', '_get_combined_index',
            '_get_distinct_indexes', '_union_indexes',
            '_get_consensus_names',

pandas/core/indexes/datetimelike.py

@@ -27,8 +27,7 @@
                           Timedelta, Timestamp, iNaT, NaT)
 from pandas._libs.period import Period
 
-from pandas.core.index import Index
-from pandas.core.indexes.base import _index_shared_docs
+from pandas.core.indexes.base import Index, _index_shared_docs
 from pandas.util.decorators import Appender, cache_readonly
 import pandas.core.dtypes.concat as _concat
 import pandas.tseries.frequencies as frequencies

pandas/core/indexes/datetimes.py

@@ -29,8 +29,8 @@
 from pandas.errors import PerformanceWarning
 from pandas.core.common import _values_from_object, _maybe_box
 
-from pandas.core.index import Index, Int64Index, Float64Index
-from pandas.core.indexes.base import _index_shared_docs
+from pandas.core.indexes.base import Index, _index_shared_docs
+from pandas.core.indexes.numeric import Int64Index, Float64Index
 import pandas.compat as compat
 from pandas.tseries.frequencies import (
     to_offset, get_period_alias,

pandas/core/indexes/timedeltas.py

@@ -17,7 +17,8 @@
 from pandas.core.dtypes.generic import ABCSeries
 from pandas.core.common import _maybe_box, _values_from_object, is_bool_indexer
 
-from pandas.core.index import Index, Int64Index
+from pandas.core.indexes.base import Index
+from pandas.core.indexes.numeric import Int64Index
 import pandas.compat as compat
 from pandas.compat import u
 from pandas.tseries.frequencies import to_offset

pandas/core/tools/__init__.py

@@ -8,7 +8,7 @@
 
 from pandas import (date_range, bdate_range, Timestamp,
                     isnull, Index, MultiIndex, DataFrame, Series,
-                    concat, Panel)
+                    concat, Panel, DatetimeIndex)
 from pandas.errors import UnsupportedFunctionCall, PerformanceWarning
 from pandas.util.testing import (assert_panel_equal, assert_frame_equal,
                                  assert_series_equal, assert_almost_equal,
@@ -3305,7 +3305,6 @@ def test_groupby_sort_multiindex_series(self):
         assert_series_equal(result, mseries_result.sort_index())
 
     def test_groupby_reindex_inside_function(self):
-        from pandas.tseries.api import DatetimeIndex
 
         periods = 1000
         ind = DatetimeIndex(start='2012/1/1', freq='5min', periods=periods)

pandas/tests/groupby/test_groupby.py

@@ -5,7 +5,8 @@
 from numpy import nan
 
 import pandas as pd
-from pandas import DataFrame, date_range, Index, Series, MultiIndex, Timestamp
+from pandas import (DataFrame, date_range, Index,
+                    Series, MultiIndex, Timestamp, DatetimeIndex)
 from pandas.compat import StringIO
 from pandas.util import testing as tm
 from pandas.util.testing import assert_frame_equal, assert_series_equal
@@ -361,7 +362,6 @@ def sumfunc_value(x):
 
     def test_groupby_groups_datetimeindex(self):
         # #1430
-        from pandas.tseries.api import DatetimeIndex
         periods = 1000
         ind = DatetimeIndex(start='2012/1/1', freq='5min', periods=periods)
         df = DataFrame({'high': np.arange(periods),

pandas/tests/groupby/test_timegrouper.py

@@ -4,10 +4,6 @@
 
 # flake8: noqa
 
-from pandas.core.indexes.datetimes import DatetimeIndex, date_range, bdate_range
 from pandas.tseries.frequencies import infer_freq
-from pandas.core.indexes.timedeltas import Timedelta, TimedeltaIndex, timedelta_range
-from pandas.core.indexes.period import Period, PeriodIndex, period_range, pnow
 from pandas.tseries.timedeltas import to_timedelta
-from pandas._libs.lib import NaT
 import pandas.tseries.offsets as offsets