From 3d04882dce65497e8a2009dc37ddff2ca39efdf4 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 20 2018 10:23:35 +0000
Subject: [PATCH 1/3] flask_wtf.Form got renamed to flask_wtf.FlaskForm in newer version of flask-wtf


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/fedocal/i18nforms.py b/fedocal/i18nforms.py
index 76d54ba..03794d8 100644
--- a/fedocal/i18nforms.py
+++ b/fedocal/i18nforms.py
@@ -24,7 +24,11 @@
  MA 02110-1301, USA.
 """
 
-from flask.ext import wtf
+try:
+   from flask_wtf import FlaskForm as FlaskForm
+except ImportError:
+   from flask_wtf import Form as FlaskForm
+
 from fedocal.fedocal_babel import gettext, ngettext
 
 
@@ -40,7 +44,7 @@ class Translations(object):
         self.ngettext = ngettext
 
 
-class Form(wtf.Form):
+class Form(FlaskForm):
     """I18n form"""
     def _get_translations(self):
         """I18n form translation"""

From d5c108cfabf13c3e506b9aff3666b1ed28b110d7 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 20 2018 10:23:35 +0000
Subject: [PATCH 2/3] Ensure the recursion_ends is provided in UTC


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index 8f51ff7..bc49f5c 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -707,7 +707,7 @@ def add_meeting_to_vcal(ical, meeting, reminder=None):
                 freq=rrule.WEEKLY,
                 interval=freq,
                 dtstart=start.value,
-                until=meeting.recursion_ends))
+                until=meeting.recursion_ends.replace(tzinfo='utc')))
         entry.rruleset = newrule
 
     if reminder:

From ac0497429a78ce9b2c2c50924e25aea81ea92920 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 20 2018 10:23:35 +0000
Subject: [PATCH 3/3] Make recursion ends timezone aware


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index bc49f5c..e28aae3 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -702,12 +702,14 @@ def add_meeting_to_vcal(ical, meeting, reminder=None):
     if meeting.recursion_frequency and meeting.recursion_ends:
         newrule = rrule.rruleset()
         freq = meeting.recursion_frequency / 7
+        recursion_ends = datetime.combine(
+            meeting.recursion_ends, time(0)).replace(tzinfo=pytz.utc)
         newrule.rrule(
             rrule.rrule(
                 freq=rrule.WEEKLY,
                 interval=freq,
                 dtstart=start.value,
-                until=meeting.recursion_ends.replace(tzinfo='utc')))
+                until=recursion_ends))
         entry.rruleset = newrule
 
     if reminder: