merge/pep fix

Author: jreback

pandas/compat/pickle_compat.py

@@ -64,7 +64,7 @@ def load_reduce(self):
     ('pandas.core.series', 'TimeSeries'): ('pandas.core.series', 'Series'),
 
     # 12588, extensions moving
-    ('pandas._sparse', 'BlockIndex'): ('pandas.sparse.libsparse', 'BlockIndex')
+    ('pandas._sparse', 'BlockIndex'): ('pandas.sparse.libsparse', 'BlockIndex'),
     ('pandas.tslib', 'Timestamp'): ('pandas.libs.tslib', 'Timestamp'),
     ('pandas.tslib', '__nat_unpickle'): ('pandas.libs.tslib', '__nat_unpickle')
     }

pandas/formats/format.py

@@ -34,7 +34,8 @@
 from pandas.formats.printing import adjoin, justify, pprint_thing
 import pandas.core.common as com
 import pandas.libs.lib as lib
-from pandas.libs.tslib import iNaT, Timestamp, Timedelta, format_array_from_datetime
+from pandas.libs.tslib import (iNaT, Timestamp, Timedelta,
+                               format_array_from_datetime)
 from pandas.tseries.index import DatetimeIndex
 from pandas.tseries.period import PeriodIndex
 import pandas as pd

pandas/sparse/array.py

@@ -27,7 +27,7 @@
 
 from pandas.sparse import libsparse as splib
 from pandas.sparse.libsparse import SparseIndex, BlockIndex, IntIndex
-import pandas.index as _index
+from pandas.libs import index as _index
 import pandas.core.algorithms as algos
 import pandas.core.ops as ops
 import pandas.formats.printing as printing

pandas/tests/groupby/test_transform.py

@@ -452,7 +452,7 @@ def test_cython_group_transform_algos(self):
         data = np.array([np.timedelta64(1, 'ns')] * 5, dtype='m8[ns]')[:, None]
         actual = np.zeros_like(data, dtype='int64')
         algos.group_cumsum(actual, data.view('int64'), labels,
-                              is_datetimelike)
+                           is_datetimelike)
         expected = np.array([np.timedelta64(1, 'ns'), np.timedelta64(
             2, 'ns'), np.timedelta64(3, 'ns'), np.timedelta64(4, 'ns'),
             np.timedelta64(5, 'ns')])

pandas/tests/indexes/timedeltas/test_construction.py

@@ -4,7 +4,6 @@
 import pandas as pd
 import pandas.util.testing as tm
 from pandas import TimedeltaIndex, timedelta_range, to_timedelta
-from pandas.libs.tslib import iNaT
 
 
 class TestTimedeltaIndex(tm.TestCase):

pandas/tests/test_base.py

@@ -20,6 +20,7 @@
 from pandas.tseries.base import DatetimeIndexOpsMixin
 from pandas.libs.tslib import iNaT
 
+
 class CheckStringMixin(object):
 
     def test_string_methods_dont_fail(self):