Skip to content

Commit

Permalink
PEP8 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
llazzaro committed May 18, 2016
1 parent 4059ab3 commit f93b3cb
Showing 1 changed file with 20 additions and 19 deletions.
39 changes: 20 additions & 19 deletions schedule/models/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,17 @@
'SECONDLY': 6
}
param_dict_order = {
'byyearday' : 1,
'bymonth' : 1,
'bymonthday' : 2,
'byweekno' : 2,
'byweekday' : 3,
'byhour' : 4,
'byminute' : 5,
'bysecond' : 6
'byyearday': 1,
'bymonth': 1,
'bymonthday': 2,
'byweekno': 2,
'byweekday': 3,
'byhour': 4,
'byminute': 5,
'bysecond': 6
}


class EventManager(models.Manager):
def get_for_object(self, content_object, distinction=None, inherit=True):
return EventRelation.objects.get_events_for_object(content_object, distinction, inherit)
Expand Down Expand Up @@ -267,14 +268,14 @@ def occurrences_after(self, after=None, max_occurences=None):
def event_start_params(self):
start = self.start
params = {
'byyearday' : start.timetuple().tm_yday,
'bymonth' : start.month,
'bymonthday' : start.day,
'byweekno' : start.isocalendar()[1],
'byweekday' : start.weekday(),
'byhour' : start.hour,
'byminute' : start.minute,
'bysecond' : start.second
'byyearday': start.timetuple().tm_yday,
'bymonth': start.month,
'bymonthday': start.day,
'byweekno': start.isocalendar()[1],
'byweekday': start.weekday(),
'byhour': start.hour,
'byminute': start.minute,
'bysecond': start.second
}
return params

Expand All @@ -291,14 +292,14 @@ def _event_params(self):
event_params = {}

for param in rule_params:
#start date influences rule params
# start date influences rule params
if (param in param_dict_order and param_dict_order[param] > freq_order and
param in start_params):
sp = start_params[param]
if sp == rule_params[param] or sp in rule_params[param]:
event_params[param] = [sp]
else:
event_params = {'count' : 0}
event_params = {'count': 0}
empty = True
break
else:
Expand Down Expand Up @@ -336,7 +337,7 @@ def effective_end(self):
elif self.end_recurring_period:
occ = None
occ_generator = self._occurrences_after_generator(self.start)
#occ_generator = iter(self.get_rrule_object())
# occ_generator = iter(self.get_rrule_object())
for occ in occ_generator:
pass
return occ.end
Expand Down

0 comments on commit f93b3cb

Please sign in to comment.