Fix ASV import error (#22978) · pandas-dev/pandas@c282e31 (original) (raw)
4 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -2,10 +2,10 @@ | ||
| 2 | 2 | |
| 3 | 3 | import numpy as np |
| 4 | 4 | import pandas.util.testing as tm |
| 5 | -from pandas import (Series, DataFrame, MultiIndex, Int64Index, Float64Index, | |
| 6 | -IntervalIndex, CategoricalIndex, | |
| 7 | -IndexSlice, concat, date_range) | |
| 8 | -from .pandas_vb_common import setup, Panel # noqa | |
| 5 | +from pandas import (Series, DataFrame, MultiIndex, Panel, | |
| 6 | +Int64Index, Float64Index, IntervalIndex, | |
| 7 | +CategoricalIndex, IndexSlice, concat, date_range) | |
| 8 | +from .pandas_vb_common import setup # noqa | |
| 9 | 9 | |
| 10 | 10 | |
| 11 | 11 | class NumericSeriesIndexing(object): |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -3,14 +3,15 @@ | ||
| 3 | 3 | |
| 4 | 4 | import numpy as np |
| 5 | 5 | import pandas.util.testing as tm |
| 6 | -from pandas import (DataFrame, Series, MultiIndex, date_range, concat, merge, | |
| 7 | -merge_asof) | |
| 6 | +from pandas import (DataFrame, Series, Panel, MultiIndex, | |
| 7 | +date_range, concat, merge, merge_asof) | |
| 8 | + | |
| 8 | 9 | try: |
| 9 | 10 | from pandas import merge_ordered |
| 10 | 11 | except ImportError: |
| 11 | 12 | from pandas import ordered_merge as merge_ordered |
| 12 | 13 | |
| 13 | -from .pandas_vb_common import Panel, setup # noqa | |
| 14 | +from .pandas_vb_common import setup # noqa | |
| 14 | 15 | |
| 15 | 16 | |
| 16 | 17 | class Append(object): |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | import warnings |
| 2 | 2 | from datetime import datetime, timedelta |
| 3 | 3 | |
| 4 | -from pandas import DataFrame, DatetimeIndex, date_range | |
| 4 | +from pandas import DataFrame, Panel, DatetimeIndex, date_range | |
| 5 | 5 | |
| 6 | -from .pandas_vb_common import Panel, setup # noqa | |
| 6 | +from .pandas_vb_common import setup # noqa | |
| 7 | 7 | |
| 8 | 8 | |
| 9 | 9 | class DifferentIndexes(object): |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| 1 | 1 | import warnings |
| 2 | 2 | |
| 3 | 3 | import numpy as np |
| 4 | +from pandas import Panel | |
| 4 | 5 | |
| 5 | -from .pandas_vb_common import Panel, setup # noqa | |
| 6 | +from .pandas_vb_common import setup # noqa | |
| 6 | 7 | |
| 7 | 8 | |
| 8 | 9 | class PanelMethods(object): |