Adjust test and move import to top

Author: mroeschke

pandas/core/reshape/tile.py

@@ -1,6 +1,7 @@
 """
 Quantilization functions and related stuff
 """
+from functools import partial
 
 from pandas.core.dtypes.missing import isna
 from pandas.core.dtypes.common import (
@@ -337,7 +338,6 @@ def _format_labels(bins, precision, right=True,
     closed = 'right' if right else 'left'
 
     if is_datetime64tz_dtype(dtype):
-        from functools import partial
         formatter = partial(Timestamp, tz=dtype.tz)
         adjust = lambda x: x - Timedelta('1ns')
     elif is_datetime64_dtype(dtype):

pandas/tests/reshape/test_tile.py

@@ -4,7 +4,7 @@
 import numpy as np
 from pandas.compat import zip
 
-from pandas import (DataFrame, Series, isna, to_datetime, DatetimeIndex,
+from pandas import (DataFrame, Series, isna, to_datetime, DatetimeIndex, Index,
                     Timestamp, Interval, IntervalIndex, Categorical,
                     cut, qcut, date_range, NaT, TimedeltaIndex)
 from pandas.tseries.offsets import Nano, Day
@@ -105,10 +105,12 @@ def test_cut_corner(self):
         pytest.raises(ValueError, cut, [1, 2, 3], 0.5)
 
     @pytest.mark.parametrize('arg', [2, np.eye(2), DataFrame(np.eye(2))])
+    @pytest.mark.parametrize('bins', [2, np.array(2), np.arange(1, 2), [1, 2],
+                                      Series([1, 2]), Index([1, 2])])
     @pytest.mark.parametrize('cut_func', [cut, qcut])
-    def test_cut_not_1d_arg(self, arg, cut_func):
+    def test_cut_not_1d_arg(self, arg, bins, cut_func):
         with pytest.raises(ValueError):
-            cut_func(arg, 2)
+            cut_func(arg, bins)
 
     def test_cut_out_of_range_more(self):
         # #1511