Fix style issues

Author: Si Wei How

pandas/tests/tseries/offsets/test_offsets.py

@@ -760,9 +760,12 @@ def setup_method(self, method):
         self.offset6 = BusinessHour(start='20:00', end='05:00')
         self.offset7 = BusinessHour(n=-2, start=dt_time(21, 30),
                                     end=dt_time(6, 30))
-        self.offset8 = BusinessHour(start=['09:00', '13:00'], end=['12:00', '17:00'])
-        self.offset9 = BusinessHour(n=3, start=['09:00', '22:00'], end=['13:00', '03:00'])
-        self.offset10 = BusinessHour(n=-1, start=['23:00', '13:00'], end=['02:00', '17:00'])
+        self.offset8 = BusinessHour(start=['09:00', '13:00'],
+                                    end=['12:00', '17:00'])
+        self.offset9 = BusinessHour(n=3, start=['09:00', '22:00'],
+                                    end=['13:00', '03:00'])
+        self.offset10 = BusinessHour(n=-1, start=['23:00', '13:00'],
+                                     end=['02:00', '17:00'])
 
     def test_constructor_errors(self):
         from datetime import time as dt_time
@@ -796,9 +799,12 @@ def test_repr(self):
         assert repr(self.offset5) == '<BusinessHour: BH=11:00-14:30>'
         assert repr(self.offset6) == '<BusinessHour: BH=20:00-05:00>'
         assert repr(self.offset7) == '<-2 * BusinessHours: BH=21:30-06:30>'
-        assert repr(self.offset8) == '<BusinessHour: BH=09:00,13:00-12:00,17:00>'
-        assert repr(self.offset9) == '<3 * BusinessHours: BH=09:00,22:00-13:00,03:00>'
-        assert repr(self.offset10) == '<-1 * BusinessHour: BH=13:00,23:00-17:00,02:00>'
+        assert (repr(self.offset8) ==
+                '<BusinessHour: BH=09:00,13:00-12:00,17:00>')
+        assert (repr(self.offset9) ==
+                '<3 * BusinessHours: BH=09:00,22:00-13:00,03:00>')
+        assert (repr(self.offset10) ==
+                '<-1 * BusinessHour: BH=13:00,23:00-17:00,02:00>')
 
     def test_with_offset(self):
         expected = Timestamp('2014-07-01 13:00')
@@ -808,7 +814,7 @@ def test_with_offset(self):
 
     def test_eq(self):
         for offset in [self.offset1, self.offset2, self.offset3, self.offset4,
-                self.offset8, self.offset9, self.offset10]:
+                       self.offset8, self.offset9, self.offset10]:
             assert offset == offset
 
         assert BusinessHour() != BusinessHour(-1)
@@ -817,14 +823,18 @@ def test_eq(self):
         assert (BusinessHour(start='09:00', end='17:00') !=
                 BusinessHour(start='17:00', end='09:01'))
 
-        assert (BusinessHour(start=['23:00', '13:00'], end=['12:00', '17:00']) ==
-                BusinessHour(start=['13:00', '23:00'], end=['17:00', '12:00']))
-        assert (BusinessHour(start=['13:00', '23:00'], end=['18:00', '07:00']) !=
-                BusinessHour(start=['13:00', '23:00'], end=['17:00', '12:00']))
+        assert (BusinessHour(start=['23:00', '13:00'],
+                             end=['12:00', '17:00']) ==
+                BusinessHour(start=['13:00', '23:00'],
+                             end=['17:00', '12:00']))
+        assert (BusinessHour(start=['13:00', '23:00'],
+                             end=['18:00', '07:00']) !=
+                BusinessHour(start=['13:00', '23:00'],
+                             end=['17:00', '12:00']))
 
     def test_hash(self):
         for offset in [self.offset1, self.offset2, self.offset3, self.offset4,
-                self.offset8, self.offset9, self.offset10]:
+                       self.offset8, self.offset9, self.offset10]:
             assert hash(offset) == hash(offset)
 
     def test_call(self):
@@ -997,7 +1007,8 @@ def test_normalize(self, case):
         datetime(2014, 7, 6, 23, 0): False,
         datetime(2014, 7, 7, 3, 0): False}))
 
-    on_offset_cases.append((BusinessHour(start=['09:00', '13:00'], end=['12:00', '17:00']), {
+    on_offset_cases.append((BusinessHour(start=['09:00', '13:00'],
+                                         end=['12:00', '17:00']), {
         datetime(2014, 7, 1, 9): True,
         datetime(2014, 7, 1, 8, 59): False,
         datetime(2014, 7, 1, 8): False,
@@ -1008,7 +1019,8 @@ def test_normalize(self, case):
         datetime(2014, 7, 6, 12): False,
         datetime(2014, 7, 1, 12, 30): False}))
 
-    on_offset_cases.append((BusinessHour(start=['19:00', '23:00'], end=['21:00', '05:00']), {
+    on_offset_cases.append((BusinessHour(start=['19:00', '23:00'],
+                                         end=['21:00', '05:00']), {
         datetime(2014, 7, 1, 9, 0): False,
         datetime(2014, 7, 1, 10, 0): False,
         datetime(2014, 7, 1, 15): False,
@@ -1189,11 +1201,16 @@ def test_onOffset(self, case):
         datetime(2014, 7, 7, 18): (datetime(2014, 7, 7, 17),
                                    datetime(2014, 7, 8, 17))}))
 
-    opening_time_cases.append(([BusinessHour(start=['11:15', '15:00'], end=['13:00', '20:00']),
-                                BusinessHour(n=3, start=['11:15', '15:00'], end=['12:00', '20:00']),
-                                BusinessHour(start=['11:15', '15:00'], end=['13:00', '17:00']),
-                                BusinessHour(n=2, start=['11:15', '15:00'], end=['12:00', '03:00']),
-                                BusinessHour(n=3, start=['11:15', '15:00'], end=['13:00', '16:00'])], {
+    opening_time_cases.append(([BusinessHour(start=['11:15', '15:00'],
+                                             end=['13:00', '20:00']),
+                                BusinessHour(n=3, start=['11:15', '15:00'],
+                                             end=['12:00', '20:00']),
+                                BusinessHour(start=['11:15', '15:00'],
+                                             end=['13:00', '17:00']),
+                                BusinessHour(n=2, start=['11:15', '15:00'],
+                                             end=['12:00', '03:00']),
+                                BusinessHour(n=3, start=['11:15', '15:00'],
+                                             end=['13:00', '16:00'])], {
         datetime(2014, 7, 1, 11): (datetime(2014, 7, 1, 11, 15),
                                    datetime(2014, 6, 30, 15)),
         datetime(2014, 7, 1, 18): (datetime(2014, 7, 2, 11, 15),
@@ -1223,10 +1240,12 @@ def test_onOffset(self, case):
         datetime(2014, 7, 7, 9, 1): (datetime(2014, 7, 7, 11, 15),
                                      datetime(2014, 7, 4, 15)),
         datetime(2014, 7, 7, 12): (datetime(2014, 7, 7, 15),
-                                     datetime(2014, 7, 7, 11, 15))}))
+                                   datetime(2014, 7, 7, 11, 15))}))
 
-    opening_time_cases.append(([BusinessHour(-1, start=['17:00', '08:00'], end=['05:00', '10:00']),
-                                BusinessHour(n=-2, start=['08:00', '17:00'], end=['10:00', '03:00'])], {
+    opening_time_cases.append(([BusinessHour(n=-1, start=['17:00', '08:00'],
+                                             end=['05:00', '10:00']),
+                                BusinessHour(n=-2, start=['08:00', '17:00'],
+                                             end=['10:00', '03:00'])], {
         datetime(2014, 7, 1, 11): (datetime(2014, 7, 1, 8),
                                    datetime(2014, 7, 1, 17)),
         datetime(2014, 7, 1, 18): (datetime(2014, 7, 1, 17),
@@ -1414,7 +1433,8 @@ def test_opening_time(self, case):
         datetime(2014, 7, 7, 19, 30, 30): datetime(2014, 7, 5, 4, 30, 30)}))
 
     # multiple business hours
-    apply_cases.append((BusinessHour(start=['09:00', '14:00'], end=['12:00', '18:00']), {
+    apply_cases.append((BusinessHour(start=['09:00', '14:00'],
+                                     end=['12:00', '18:00']), {
         datetime(2014, 7, 1, 11): datetime(2014, 7, 1, 14),
         datetime(2014, 7, 1, 15): datetime(2014, 7, 1, 16),
         datetime(2014, 7, 1, 19): datetime(2014, 7, 2, 10),
@@ -1434,7 +1454,8 @@ def test_opening_time(self, case):
         datetime(2014, 7, 4, 17, 30): datetime(2014, 7, 7, 9, 30),
         datetime(2014, 7, 4, 17, 30, 30): datetime(2014, 7, 7, 9, 30, 30)}))
 
-    apply_cases.append((BusinessHour(n=4, start=['09:00', '14:00'], end=['12:00', '18:00']), {
+    apply_cases.append((BusinessHour(n=4, start=['09:00', '14:00'],
+                                     end=['12:00', '18:00']), {
         datetime(2014, 7, 1, 11): datetime(2014, 7, 1, 17),
         datetime(2014, 7, 1, 13): datetime(2014, 7, 2, 9),
         datetime(2014, 7, 1, 15): datetime(2014, 7, 2, 10),
@@ -1450,7 +1471,8 @@ def test_opening_time(self, case):
         datetime(2014, 7, 4, 16, 30): datetime(2014, 7, 7, 11, 30),
         datetime(2014, 7, 4, 16, 30, 30): datetime(2014, 7, 7, 11, 30, 30)}))
 
-    apply_cases.append((BusinessHour(n=-4, start=['09:00', '14:00'], end=['12:00', '18:00']), {
+    apply_cases.append((BusinessHour(n=-4, start=['09:00', '14:00'],
+                                     end=['12:00', '18:00']), {
         datetime(2014, 7, 1, 11): datetime(2014, 6, 30, 16),
         datetime(2014, 7, 1, 13): datetime(2014, 6, 30, 17),
         datetime(2014, 7, 1, 15): datetime(2014, 6, 30, 18),
@@ -1466,7 +1488,8 @@ def test_opening_time(self, case):
         datetime(2014, 7, 7, 9, 30): datetime(2014, 7, 4, 14, 30),
         datetime(2014, 7, 7, 9, 30, 30): datetime(2014, 7, 4, 14, 30, 30)}))
 
-    apply_cases.append((BusinessHour(n=-1, start=['19:00', '03:00'], end=['01:00', '05:00']), {
+    apply_cases.append((BusinessHour(n=-1, start=['19:00', '03:00'],
+                                     end=['01:00', '05:00']), {
         datetime(2014, 7, 1, 17): datetime(2014, 7, 1, 4),
         datetime(2014, 7, 2, 14): datetime(2014, 7, 2, 4),
         datetime(2014, 7, 2, 8): datetime(2014, 7, 2, 4),
@@ -1541,7 +1564,8 @@ def test_apply(self, case):
         datetime(2014, 7, 7, 23, 30): datetime(2014, 7, 15, 21, 30)}))
 
     # large n for multiple opening hours (3 days and 1 hour before)
-    apply_large_n_cases.append((BusinessHour(n=-25, start=['09:00', '14:00'], end=['12:00', '19:00']), {
+    apply_large_n_cases.append((BusinessHour(n=-25, start=['09:00', '14:00'],
+                                             end=['12:00', '19:00']), {
         datetime(2014, 7, 1, 11): datetime(2014, 6, 26, 10),
         datetime(2014, 7, 1, 13): datetime(2014, 6, 26, 11),
         datetime(2014, 7, 1, 9): datetime(2014, 6, 25, 18),
@@ -1557,7 +1581,8 @@ def test_apply(self, case):
         datetime(2014, 7, 7, 10, 30, 30): datetime(2014, 7, 2, 9, 30, 30)}))
 
     # 5 days and 3 hours later
-    apply_large_n_cases.append((BusinessHour(28, start=['21:00', '03:00'], end=['01:00', '04:00']), {
+    apply_large_n_cases.append((BusinessHour(28, start=['21:00', '03:00'],
+                                             end=['01:00', '04:00']), {
         datetime(2014, 7, 1, 11): datetime(2014, 7, 9, 0),
         datetime(2014, 7, 1, 22): datetime(2014, 7, 9, 3),
         datetime(2014, 7, 1, 23): datetime(2014, 7, 9, 21),

pandas/tseries/offsets.py

@@ -588,15 +588,17 @@ def __init__(self, start='09:00', end='17:00', offset=timedelta(0)):
 
         # Validation of input
         if len(start) != len(end):
-            raise ValueError('number of starting time and ending time must be the same')
+            raise ValueError('number of starting time and ending time'
+                             'must be the same')
         num_openings = len(start)
         openings = sorted(zip(start, end))
         start = tuple(x for x, _ in openings)
         end = tuple(x for _, x in openings)
         total_secs = 0
         for i in range(num_openings):
             total_secs += self._get_business_hours_by_sec(start[i], end[i])
-            total_secs += self._get_business_hours_by_sec(end[i], start[(i + 1) % num_openings])
+            total_secs += self._get_business_hours_by_sec(
+                end[i], start[(i + 1) % num_openings])
         if total_secs != 24 * 60 * 60:
             raise ValueError('invalid starting and ending time(s)')
 
@@ -740,7 +742,8 @@ def rollforward(self, dt):
     def _get_closing_time(self, dt):
         for i, st in enumerate(self.start):
             if st.hour == dt.hour and st.minute == dt.minute:
-                return dt + timedelta(seconds=self._get_business_hours_by_sec(st, self.end[i]))
+                return dt + timedelta(
+                    seconds=self._get_business_hours_by_sec(st, self.end[i]))
         raise ValueError("dt should be a starting time")
 
     @apply_wraps
@@ -751,8 +754,8 @@ def apply(self, other):
             # reset timezone and nanosecond
             # other may be a Timestamp, thus not use replace
             other = datetime(other.year, other.month, other.day,
-                    other.hour, other.minute,
-                    other.second, other.microsecond)
+                             other.hour, other.minute,
+                             other.second, other.microsecond)
             n = self.n
             if n >= 0:
                 if (other.time() in self.end or
@@ -767,7 +770,7 @@ def apply(self, other):
                     other = self._get_closing_time(other)
 
             businesshours = sum(self._get_business_hours_by_sec(st, en)
-                    for st, en in zip(self.start, self.end))
+                                for st, en in zip(self.start, self.end))
             bd, r = divmod(abs(n * 60), businesshours // 60)
             if n < 0:
                 bd, r = -bd, -r
@@ -788,7 +791,8 @@ def apply(self, other):
             # because of previous adjustment, time will be larger than start
             if n >= 0:
                 while rem != timedelta(0):
-                    bhour_left = self._get_closing_time(self._prev_opening_time(other)) - other
+                    bhour_left = self._get_closing_time(
+                        self._prev_opening_time(other)) - other
                     if bhour_left >= rem:
                         other = other + rem
                         rem = timedelta(0)
@@ -804,7 +808,8 @@ def apply(self, other):
                     else:
                         rem = rem - bhour_left
                         other = self._get_closing_time(
-                            self._next_opening_time(other + bhour_left - timedelta(seconds=1)))
+                            self._next_opening_time(
+                                other + bhour_left - timedelta(seconds=1)))
 
             # edge handling
             if n >= 0:
@@ -814,12 +819,12 @@ def apply(self, other):
                 if other.time() in self.start and nanosecond == 0:
                     # adjustment to move to previous business day
                     other = self._get_closing_time(self._next_opening_time(
-                            other - timedelta(seconds=1)))
+                        other - timedelta(seconds=1)))
 
             return other
         else:
             raise ApplyTypeError(
-                    'Only know how to combine business hour with datetime')
+                'Only know how to combine business hour with datetime')
 
     def onOffset(self, dt):
         if self.normalize and not _is_normalized(dt):
@@ -848,7 +853,8 @@ def _onOffset(self, dt):
         businesshours = 0
         for i, st in enumerate(self.start):
             if op.hour == st.hour and op.minute == st.minute:
-                businesshours = self._get_business_hours_by_sec(st, self.end[i])
+                businesshours = self._get_business_hours_by_sec(
+                    st, self.end[i])
         if span <= businesshours:
             return True
         else: