entrouvert
/
combo-plugin-gnm
17
0
Fork 0
Code Issues Pull Requests Releases Activity

python3: adapt to .keys() and .values() changes

This commit is contained in:
Frédéric Péters 2018-03-31 20:18:28 +02:00
parent 3804b048c9
commit b99589ad79
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
combo_plugin_gnm/templatetags/gnm.py
View File

@ -51,6 +51,8 @@ EN_ABBREV_WEEKDAYS = OrderedDict([
('sa', 'Saturday'),
('su', 'Sunday')
])
EN_ABBREV_WEEKDAYS_LIST = list(EN_ABBREV_WEEKDAYS.keys())
WEEKDAYS = list(EN_ABBREV_WEEKDAYS.values())
class TimeSlot(object):
@ -118,7 +120,6 @@ def get_slots_from_mairie_format(data, base_datetime):
exclusion_slots = []
if len(data.get('openinghours', [])) or len(data.get('openinghoursspecification', [])):
known_format = True
WEEKDAYS = EN_ABBREV_WEEKDAYS.values()
# prepare annual opening exclusions
for specification in data.get('openinghoursspecification', []):
valid_from, valid_through = (
@ -149,9 +150,9 @@ def get_slots_from_mairie_format(data, base_datetime):
parts = re.match('(\w\w)-(\w\w) (\d\d):(\d\d)-(\d\d):(\d\d)', openinghours).groups()
except AttributeError:
continue
for weekday in EN_ABBREV_WEEKDAYS.keys()[
EN_ABBREV_WEEKDAYS.keys().index(parts[0].lower()):
EN_ABBREV_WEEKDAYS.keys().index(parts[1].lower())+1]:
for weekday in EN_ABBREV_WEEKDAYS_LIST[
EN_ABBREV_WEEKDAYS_LIST.index(parts[0].lower()):
EN_ABBREV_WEEKDAYS_LIST.index(parts[1].lower())+1]:
timeslot = TimeSlot(
openinghours_to_datetime(weekday, int(parts[2]), int(parts[3]), default=base_datetime),
openinghours_to_datetime(weekday, int(parts[4]), int(parts[5]), default=base_datetime)