Merge pull request #182 from brutasse/feature/ch-vd

Switzerland: add rules for canton of Vaud

CHANGELOG

@@ -10,7 +10,7 @@ master (unreleased)
 - Add Latvia. thx @gregn610 (#178).
 - Add Malta. thx @gregn610 (#179).
 - Add Romania. thx @gregn610 (#180).
-
+- Add Canton of Vaud (Switzerland) - @brutasse (#182)
 
 1.0.0 (2016-12-12)
 ------------------

README.rst

@@ -106,6 +106,7 @@ Europe
 * Spain (incl. Catalonia)
 * Slovenia
 * Switzerland
+  * Vaud
 
 America
 -------

workalendar/europe/__init__.py

@@ -27,7 +27,7 @@
 from .slovenia import Slovenia
 from .spain import Spain, Catalonia
 from .sweden import Sweden
-from .switzerland import Switzerland
+from .switzerland import Switzerland, Vaud
 from .united_kingdom import UnitedKingdom, UnitedKingdomNorthernIreland
 
 # Germany
@@ -71,6 +71,7 @@
     Spain,
     Sweden,
     Switzerland,
+    Vaud,
     UnitedKingdom,
     UnitedKingdomNorthernIreland,
 

workalendar/europe/switzerland.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from datetime import date, timedelta
+
 from workalendar.core import WesternCalendar, ChristianMixin
 
 
@@ -19,3 +21,30 @@ class Switzerland(WesternCalendar, ChristianMixin):
         (5, 1, "Labour Day"),
         (8, 1, "National Holiday"),
     )
+
+
+class Vaud(Switzerland):
+    """Canton of Vaud"""
+    include_boxing_day = False
+    include_federal_thanksgiving_monday = True
+
+    FIXED_HOLIDAYS = WesternCalendar.FIXED_HOLIDAYS + (
+        (1, 2, "Berchtold's Day"),
+        (8, 1, "National Holiday"),
+    )
+
+    def get_federal_thanksgiving_monday(self, year):
+        "Monday following the 3rd sunday of September"
+        september_1st = date(year, 9, 1)
+        return (
+            september_1st +
+            (6 - september_1st.weekday()) * timedelta(days=1) +  # 1st sunday
+            timedelta(days=15)  # Monday following 3rd sunday
+        )
+
+    def get_variable_days(self, year):
+        days = super(Vaud, self).get_variable_days(year)
+        if self.include_federal_thanksgiving_monday:
+            days.append((self.get_federal_thanksgiving_monday(year),
+                         "Federal Thanksgiving Monday"))
+        return days

workalendar/tests/test_europe.py

@@ -28,7 +28,7 @@
 from workalendar.europe import Romania
 from workalendar.europe import Spain, Catalonia
 from workalendar.europe import Slovenia
-from workalendar.europe import Switzerland
+from workalendar.europe import Switzerland, Vaud
 from workalendar.europe import UnitedKingdom
 from workalendar.europe import UnitedKingdomNorthernIreland
 from workalendar.europe import EuropeanCentralBank
@@ -1159,6 +1159,22 @@ def test_year_2016(self):
         self.assertIn(date(2016, 12, 26), holidays)
 
 
+class VaudTest(GenericCalendarTest):
+    cal_class = Vaud
+
+    def test_year_2016(self):
+        holidays = self.cal.holidays_set(2016)
+        self.assertIn(date(2016, 9, 19), holidays)
+        self.assertNotIn(date(2016, 5, 1), holidays)
+        self.assertNotIn(date(2016, 12, 26), holidays)
+
+    def test_year_2017(self):
+        holidays = self.cal.holidays_set(2017)
+        self.assertIn(date(2017, 9, 18), holidays)
+        self.assertNotIn(date(2017, 5, 1), holidays)
+        self.assertNotIn(date(2017, 12, 26), holidays)
+
+
 class EstoniaTest(GenericCalendarTest):
     cal_class = Estonia