Edit error messages

Author: Si Wei How

pandas/tests/tseries/offsets/test_offsets.py

@@ -770,7 +770,8 @@ def setup_method(self, method):
     def test_constructor_errors(self):
         from datetime import time as dt_time
         with pytest.raises(ValueError,
-                           match='time data must be specified only with hour and minute'):
+                           match='time data must be specified only with hour '
+                           'and minute'):
             BusinessHour(start=dt_time(11, 0, 5))
         with pytest.raises(ValueError,
                            match="time data must match '%H:%M' format"):
@@ -779,10 +780,10 @@ def test_constructor_errors(self):
                            match="time data must match '%H:%M' format"):
             BusinessHour(start='14:00:05')
         with pytest.raises(ValueError,
-                           match='number of starting time cannot be 0'):
+                           match='Must include at least 1 start time'):
             BusinessHour(start=[])
         with pytest.raises(ValueError,
-                           match='number of ending time cannot be 0'):
+                           match='Must include at least 1 end time'):
             BusinessHour(end=[])
         with pytest.raises(ValueError,
                            match='number of starting time and ending time '
@@ -793,7 +794,9 @@ def test_constructor_errors(self):
                                  'must be the same'):
             BusinessHour(start=['09:00', '11:00'], end=['10:00'])
         with pytest.raises(ValueError,
-                           match=r'invalid starting and ending time\(s\)'):
+                           match=r'invalid starting and ending time\(s\): '
+                           'opening hours should not touch or overlap with '
+                           'one another'):
             BusinessHour(start=['09:00', '11:00'], end=['12:00', '20:00'])
 
     def test_different_normalize_equals(self):

pandas/tseries/offsets.py

@@ -583,13 +583,13 @@ def __init__(self, start='09:00', end='17:00', offset=timedelta(0)):
         if _iterable_not_string(start):
             start = np.asarray(start)
             if len(start) == 0:
-                raise ValueError('number of starting time cannot be 0')
+                raise ValueError('Must include at least 1 start time')
         else:
             start = np.array([start])
         if _iterable_not_string(end):
             end = np.asarray(end)
             if len(end) == 0:
-                raise ValueError('number of ending time cannot be 0')
+                raise ValueError('Must include at least 1 end time')
         else:
             end = np.array([end])
 
@@ -614,7 +614,9 @@ def __init__(self, start='09:00', end='17:00', offset=timedelta(0)):
             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)')
+            raise ValueError('invalid starting and ending time(s): '
+                             'opening hours should not touch or overlap with '
+                             'one another')
 
         object.__setattr__(self, "start", start)
         object.__setattr__(self, "end", end)
@@ -641,11 +643,12 @@ def next_bday(self):
     def _get_daytime_flag(self, start, end):
         return start < end
 
-    def _next_opening_time(self, other, dir=1):
+    def _next_opening_time(self, other, sign=1):
         """
-        If self.n and dir have the same sign, return the earliest opening time
+        If self.n and sign have the same sign, return the earliest opening time
         later than or equal to current time.
-        Otherwise the latest opening time earlier than or equal to current time.
+        Otherwise the latest opening time earlier than or equal to current
+        time.
 
         Opening time always locates on BusinessDay.
         However, closing time may not if business hour extends over midnight.
@@ -654,25 +657,25 @@ def _next_opening_time(self, other, dir=1):
         latest_start = self.start[-1]
         if not self.next_bday.onOffset(other):
             # today is not business day
-            other = other + dir * self.next_bday
-            if self.n * dir >= 0:
+            other = other + sign * self.next_bday
+            if self.n * sign >= 0:
                 return datetime(other.year, other.month, other.day,
                                 earliest_start.hour, earliest_start.minute)
             else:
                 return datetime(other.year, other.month, other.day,
                                 latest_start.hour, latest_start.minute)
         else:
-            if self.n * dir >= 0 and latest_start < other.time():
+            if self.n * sign >= 0 and latest_start < other.time():
                 # current time is after latest starting time in today
-                other = other + dir * self.next_bday
+                other = other + sign * self.next_bday
                 return datetime(other.year, other.month, other.day,
                                 earliest_start.hour, earliest_start.minute)
-            elif self.n * dir < 0 and other.time() < earliest_start:
+            elif self.n * sign < 0 and other.time() < earliest_start:
                 # current time is before earliest starting time in today
-                other = other + dir * self.next_bday
+                other = other + sign * self.next_bday
                 return datetime(other.year, other.month, other.day,
                                 latest_start.hour, latest_start.minute)
-        if self.n * dir >= 0:
+        if self.n * sign >= 0:
             # find earliest starting time later than or equal to current time
             for st in self.start:
                 if other.time() <= st:
@@ -689,10 +692,11 @@ def _prev_opening_time(self, other):
         """
         If n is positive, return the latest opening time earlier than or equal
         to current time.
-        Otherwise the earliest opening time later than or equal to current time.
+        Otherwise the earliest opening time later than or equal to current
+        time.
 
         """
-        return self._next_opening_time(other, dir=-1)
+        return self._next_opening_time(other, sign=-1)
 
     def _get_business_hours_by_sec(self, start, end):
         """