Merge branch 'beta' of github.com:dr-prodigy/python-holidays into beta

dr-prodigy · dr-prodigy · commit b140c2fa5e45 · 2018-11-27T23:48:30.000+01:00
diff --git a/README.rst b/README.rst
@@ -439,4 +439,4 @@ License
 .. __: https://github.com/dr-prodigy/python-holidays/raw/master/LICENSE
 
 Code and documentation are available according to the MIT License
-(see LICENSE__).
+(see LICENSE__).
diff --git a/holidays.py b/holidays.py
@@ -2074,21 +2074,23 @@ def _populate(self, year):
 
             self[easter(year) - rd(days=2)] = 'Karfreitag'
 
-            # will always be a Sunday and we have no "observed" rule so
-            # this is pretty pointless but it's nonetheless an official
-            # holiday by law
-            self[easter(year)] = 'Ostersonntag'
+            if self.prov == "BB":
+                # will always be a Sunday and we have no "observed" rule so
+                # this is pretty pointless but it's nonetheless an official
+                # holiday by law
+                self[easter(year)] = "Ostersonntag"
 
             self[easter(year) + rd(days=1)] = 'Ostermontag'
 
             self[date(year, MAY, 1)] = 'Erster Mai'
 
             self[easter(year) + rd(days=39)] = 'Christi Himmelfahrt'
 
-            # will always be a Sunday and we have no "observed" rule so
-            # this is pretty pointless but it's nonetheless an official
-            # holiday by law
-            self[easter(year) + rd(days=49)] = 'Pfingstsonntag'
+            if self.prov == "BB":
+                # will always be a Sunday and we have no "observed" rule so
+                # this is pretty pointless but it's nonetheless an official
+                # holiday by law
+                self[easter(year) + rd(days=49)] = "Pfingstsonntag"
 
             self[easter(year) + rd(days=50)] = 'Pfingstmontag'
 
diff --git a/tests.py b/tests.py
@@ -2488,9 +2488,13 @@ def test_ostersonntag(self):
                       (2017, 4, 16), (2018, 4, 1), (2019, 4, 21),
                       (2020, 4, 12), (2021, 4, 4), (2022, 4, 17),
                       (2023, 4, 9), (2024, 3, 31)]
+        provinces_that_have = {"BB"}
+        provinces_that_dont = set(holidays.DE.PROVINCES) - provinces_that_have
 
-        for province, (y, m, d) in product(holidays.DE.PROVINCES, known_good):
+        for province, (y, m, d) in product(provinces_that_have, known_good):
             self.assertIn(date(y, m, d), self.prov_hols[province])
+        for province, (y, m, d) in product(provinces_that_dont, known_good):
+            self.assertNotIn(date(y, m, d), self.prov_hols[province])
 
     def test_ostermontag(self):
         known_good = [(2014, 4, 21), (2015, 4, 6), (2016, 3, 28),
@@ -2515,9 +2519,13 @@ def test_pfingstsonntag(self):
                       (2017, 6, 4), (2018, 5, 20), (2019, 6, 9),
                       (2020, 5, 31), (2021, 5, 23), (2022, 6, 5),
                       (2023, 5, 28), (2024, 5, 19)]
+        provinces_that_have = {"BB"}
+        provinces_that_dont = set(holidays.DE.PROVINCES) - provinces_that_have
 
-        for province, (y, m, d) in product(holidays.DE.PROVINCES, known_good):
+        for province, (y, m, d) in product(provinces_that_have, known_good):
             self.assertIn(date(y, m, d), self.prov_hols[province])
+        for province, (y, m, d) in product(provinces_that_dont, known_good):
+            self.assertNotIn(date(y, m, d), self.prov_hols[province])
 
     def test_pfingstmontag(self):
         known_good = [(2014, 6, 9), (2015, 5, 25), (2016, 5, 16),
