edits per reviewer suggestions

Author: jbrockmendel

pandas/tests/tseries/conftest.py

@@ -1,4 +1,10 @@
 import pytest
+import pandas.tseries.offsets as offsets
+
+
+@pytest.fixture(params=[getattr(offsets, o) for o in offsets.__all__])
+def offset_types(request):
+    return request.param
 
 
 @pytest.fixture(params=[None, 'UTC', 'Asia/Tokyo', 'US/Eastern',

pandas/tests/tseries/test_offsets.py

@@ -42,20 +42,6 @@
 from pandas.tseries.holiday import USFederalHolidayCalendar
 
 
-offset_classes = [getattr(offsets, x) for x in dir(offsets)]
-offset_classes = [x for x in offset_classes if inspect.isclass(x) and
-                  issubclass(x, DateOffset) and
-                  x not in [offsets.YearOffset, offsets.Tick,
-                            offsets.SingleConstructorOffset,
-                            offsets.SemiMonthOffset,
-                            offsets.QuarterOffset, offsets.MonthOffset]]
-
-
-@pytest.fixture(params=offset_classes)
-def offset_types(request):
-    return request.param
-
-
 def test_monthrange():
     import calendar
     for y in range(2000, 2013):
@@ -4918,6 +4904,14 @@ def test_all_offset_classes(self):
 
 # ---------------------------------------------------------------------
 
+offset_classes = [getattr(offsets, x) for x in dir(offsets)]
+offset_classes = [x for x in offset_classes if inspect.isclass(x) and
+                  issubclass(x, DateOffset) and
+                  x not in [offsets.YearOffset, offsets.Tick,
+                            offsets.SingleConstructorOffset,
+                            offsets.SemiMonthOffset,
+                            offsets.QuarterOffset, offsets.MonthOffset]]
+
 month_classes = [x for x in offset_classes if
                  issubclass(x, offsets.MonthOffset)]
 

pandas/tseries/offsets.py

@@ -165,7 +165,6 @@ def __add__(date):
     normalize = False
 
     def __init__(self, n=1, normalize=False, **kwds):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self.kwds = kwds
@@ -473,7 +472,6 @@ class BusinessDay(BusinessMixin, SingleConstructorOffset):
     _adjust_dst = True
 
     def __init__(self, n=1, normalize=False, offset=timedelta(0)):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self.kwds = {'offset': offset}
@@ -783,7 +781,6 @@ class BusinessHour(BusinessHourMixin, SingleConstructorOffset):
 
     def __init__(self, n=1, normalize=False, start='09:00',
                  end='17:00', offset=timedelta(0)):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         super(BusinessHour, self).__init__(start=start, end=end, offset=offset)
@@ -821,7 +818,6 @@ class CustomBusinessDay(BusinessDay):
 
     def __init__(self, n=1, normalize=False, weekmask='Mon Tue Wed Thu Fri',
                  holidays=None, calendar=None, offset=timedelta(0)):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self._offset = offset
@@ -890,7 +886,6 @@ class CustomBusinessHour(BusinessHourMixin, SingleConstructorOffset):
     def __init__(self, n=1, normalize=False, weekmask='Mon Tue Wed Thu Fri',
                  holidays=None, calendar=None,
                  start='09:00', end='17:00', offset=timedelta(0)):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         super(CustomBusinessHour, self).__init__(start=start,
@@ -920,7 +915,6 @@ class MonthOffset(SingleConstructorOffset):
     _adjust_dst = True
 
     def __init__(self, n=1, normalize=False):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self._offset = timedelta(1)
@@ -1002,7 +996,6 @@ def __init__(self, n=1, normalize=False, day_of_month=None):
             raise ValueError(msg.format(min=self._min_day_of_month,
                                         day=self.day_of_month))
 
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self.kwds = {'day_of_month': self.day_of_month}
@@ -1279,7 +1272,6 @@ class CustomBusinessMonthEnd(BusinessMixin, MonthOffset):
 
     def __init__(self, n=1, normalize=False, weekmask='Mon Tue Wed Thu Fri',
                  holidays=None, calendar=None, offset=timedelta(0)):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self._offset = offset
@@ -1351,7 +1343,6 @@ class CustomBusinessMonthBegin(BusinessMixin, MonthOffset):
 
     def __init__(self, n=1, normalize=False, weekmask='Mon Tue Wed Thu Fri',
                  holidays=None, calendar=None, offset=timedelta(0)):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self._offset = offset
@@ -1416,7 +1407,6 @@ class Week(EndMixin, DateOffset):
     _prefix = 'W'
 
     def __init__(self, n=1, normalize=False, weekday=None):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self.weekday = weekday
@@ -1508,7 +1498,6 @@ class WeekOfMonth(DateOffset):
     _adjust_dst = True
 
     def __init__(self, n=1, normalize=False, week=None, weekday=None):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self.weekday = weekday
@@ -1605,7 +1594,6 @@ class LastWeekOfMonth(DateOffset):
     _prefix = 'LWOM'
 
     def __init__(self, n=1, normalize=False, weekday=None):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self.weekday = weekday
@@ -1679,7 +1667,6 @@ class QuarterOffset(DateOffset):
     #       point
 
     def __init__(self, n=1, normalize=False, startingMonth=None):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         if startingMonth is None:
@@ -2118,7 +2105,6 @@ class FY5253(DateOffset):
 
     def __init__(self, n=1, normalize=False, weekday=0, startingMonth=1,
                  variation="nearest"):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self.startingMonth = startingMonth
@@ -2369,7 +2355,6 @@ class FY5253Quarter(DateOffset):
 
     def __init__(self, n=1, normalize=False, weekday=0, startingMonth=1,
                  qtr_with_extra_week=1, variation="nearest"):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
 
@@ -2498,7 +2483,6 @@ class Easter(DateOffset):
     _adjust_dst = True
 
     def __init__(self, n=1, normalize=False):
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self._offset = timedelta(1)
@@ -2551,7 +2535,6 @@ class Tick(SingleConstructorOffset):
 
     def __init__(self, n=1, normalize=False):
         # TODO: do Tick classes with normalize=True make sense?
-        assert n == int(n)
         self.n = int(n)
         self.normalize = normalize
         self._offset = timedelta(1)