Remove Python 2 styled super() calls

refs #442
workalendar · Jan 10, 2020 · 2d76d32 · 2d76d32
1 parent 00af198
commit 2d76d32
Show file tree

Hide file tree

Showing 69 changed files with 138 additions and 142 deletions.
diff --git a/contributing.md b/contributing.md
@@ -153,7 +153,7 @@ class Zhraa(WesternCalendar, ChristianMixin):
 
     def get_variable_days(self, year):
         # usual variable days
-        days = super(Zhraa, self).get_variable_days(year)
+        days = super().get_variable_days(year)
 
         days.append(
             (Zhraa.get_nth_weekday_in_month(year, 6, MON),

diff --git a/workalendar/africa/angola.py b/workalendar/africa/angola.py
@@ -27,6 +27,6 @@ def get_variable_entrudo(self, year):
         return easter_sunday - timedelta(days=47)
 
     def get_variable_days(self, year):
-        days = super(Angola, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append((self.get_variable_entrudo(year), "Dia de Carnaval"))
         return days
diff --git a/workalendar/africa/south_africa.py b/workalendar/africa/south_africa.py
@@ -17,7 +17,7 @@ def holidays(self, year=None):
         if year < 1910:
             raise CalendarError("It's not possible to compute holidays prior"
                                 " to 1910 for South Africa.")
-        return super(SouthAfrica, self).holidays(year)
+        return super().holidays(year)
 
     def get_easter_monday_or_family_day(self, year):
         if year < 1980:
@@ -27,7 +27,7 @@ def get_easter_monday_or_family_day(self, year):
         return (self.get_easter_monday(year), label)
 
     def get_fixed_holidays(self, year):
-        days = super(SouthAfrica, self).get_fixed_holidays(year)
+        days = super().get_fixed_holidays(year)
         if year >= 1990:
             days.append((date(year, 3, 21), 'Human Rights Day'))
 
@@ -85,7 +85,7 @@ def get_fixed_holidays(self, year):
         return days
 
     def get_variable_days(self, year):
-        days = super(SouthAfrica, self).get_variable_days(year)
+        days = super().get_variable_days(year)
 
         days.append(self.get_easter_monday_or_family_day(year))
 
@@ -118,7 +118,7 @@ def get_variable_days(self, year):
         return days
 
     def get_calendar_holidays(self, year):
-        days = super(SouthAfrica, self).get_calendar_holidays(year)
+        days = super().get_calendar_holidays(year)
         # compute shifting days
         for holiday, label in days:
             if holiday.weekday() == SUN:

diff --git a/workalendar/america/argentina.py b/workalendar/america/argentina.py
@@ -25,7 +25,7 @@ class Argentina(WesternCalendar, ChristianMixin):
 
     def get_variable_days(self, year):
 
-        days = super(Argentina, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append(
             (self.get_easter_sunday(year) - timedelta(days=48),
                 "Carnival Lunes"))

diff --git a/workalendar/america/barbados.py b/workalendar/america/barbados.py
@@ -36,7 +36,7 @@ def get_variable_days(self, year):
         """
         Return variable holidays of the Barbados calendar.
         """
-        days = super(Barbados, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append(self.get_kadooment_day(year))
         return days
 
@@ -46,7 +46,7 @@ def get_fixed_holidays(self, year):
 
         A shift day is appended if a fixed holiday happens on SUN.
         """
-        days = super(Barbados, self).get_fixed_holidays(year)
+        days = super().get_fixed_holidays(year)
         days_to_shift = copy(days)
         for day, label in days_to_shift:
             if day.weekday() == SUN:

diff --git a/workalendar/america/brazil.py b/workalendar/america/brazil.py
@@ -42,7 +42,7 @@ def get_carnaval(self, year):
         return self.get_easter_sunday(year) - timedelta(days=47)
 
     def get_variable_days(self, year):
-        days = super(Brazil, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         if self.include_sao_jose:
             days.append((date(year, 3, 19), self.sao_jose_label))
         if self.include_sao_pedro:
@@ -246,7 +246,7 @@ def get_dia_do_comercio(self, year):
         return BrazilRioDeJaneiro.get_nth_weekday_in_month(year, 10, MON, 3)
 
     def get_variable_days(self, year):
-        days = super(BrazilRioDeJaneiro, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append((self.get_carnaval(year), "Carnaval"))
         days.append((self.get_dia_do_comercio(year), "Dia do Comércio"))
         return days
@@ -317,7 +317,7 @@ class BrazilSaoPauloCity(BrazilSaoPauloState):
     consciencia_negra_label = "Dia da Consciência Negra"
 
     def get_variable_days(self, year):
-        days = super(BrazilSaoPauloCity, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append((self.get_carnaval(year), "Carnaval"))
         return days
 
@@ -396,7 +396,7 @@ class BrazilSerraCity(BrazilEspiritoSanto):
     include_nossa_senhora_conceicao = True
 
     def get_variable_days(self, year):
-        days = super(BrazilSerraCity, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         carnaval_tuesday = self.get_carnaval(year)
         days.append((carnaval_tuesday - timedelta(days=1), "Carnaval Monday"))
         days.append((carnaval_tuesday, "Carnaval"))

diff --git a/workalendar/america/canada.py b/workalendar/america/canada.py
@@ -15,7 +15,7 @@ class Canada(WesternCalendar, ChristianMixin):
 
     def get_variable_days(self, year):
         # usual variable days
-        days = super(Canada, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append(
             (Canada.get_nth_weekday_in_month(year, 9, MON, 1), "Labor Day")
         )
@@ -119,7 +119,7 @@ class Ontario(Canada, BoxingDayMixin, ThanksgivingMixin, VictoriaDayMixin,
     include_good_friday = True
 
     def get_variable_days(self, year):
-        days = super(Ontario, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_family_day(year)),
             (self.get_victoria_day(year)),
@@ -137,7 +137,7 @@ class Quebec(Canada, VictoriaDayMixin, StJeanBaptisteMixin, ThanksgivingMixin):
     include_easter_monday = True
 
     def get_variable_days(self, year):
-        days = super(Quebec, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_victoria_day(year)),
             (self.get_thanksgiving(year)),
@@ -158,7 +158,7 @@ class BritishColumbia(Canada, VictoriaDayMixin, AugustCivicHolidayMixin,
     )
 
     def get_variable_days(self, year):
-        days = super(BritishColumbia, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_family_day(year)),
             (self.get_victoria_day(year)),
@@ -178,7 +178,7 @@ class Alberta(Canada, LateFamilyDayMixin, VictoriaDayMixin, ThanksgivingMixin):
     )
 
     def get_variable_days(self, year):
-        days = super(Alberta, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_family_day(year)),
             (self.get_victoria_day(year)),
@@ -195,7 +195,7 @@ class Saskatchewan(Canada, LateFamilyDayMixin, VictoriaDayMixin,
     include_good_friday = True
 
     def get_variable_days(self, year):
-        days = super(Saskatchewan, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_family_day(year)),
             (self.get_victoria_day(year)),
@@ -213,7 +213,7 @@ class Manitoba(Canada, LateFamilyDayMixin, VictoriaDayMixin,
     include_good_friday = True
 
     def get_variable_days(self, year):
-        days = super(Manitoba, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_family_day(year, "Louis Riel Day")),
             (self.get_victoria_day(year)),
@@ -234,7 +234,7 @@ class NewBrunswick(Canada, AugustCivicHolidayMixin):
     include_good_friday = True
 
     def get_variable_days(self, year):
-        days = super(NewBrunswick, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append(self.get_civic_holiday(year))
         return days
 
@@ -246,7 +246,7 @@ class NovaScotia(Canada, RemembranceDayShiftMixin, LateFamilyDayMixin):
     include_good_friday = True
 
     def get_variable_days(self, year):
-        days = super(NovaScotia, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend(self.get_remembrance_day(year))
         if year >= 2015:
             days.append(self.get_family_day(year, "Viola Desmond Day"))
@@ -260,7 +260,7 @@ class PrinceEdwardIsland(Canada, LateFamilyDayMixin, RemembranceDayShiftMixin):
     include_good_friday = True
 
     def get_variable_days(self, year):
-        days = super(PrinceEdwardIsland, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append((self.get_family_day(year, "Islander Day")))
         days.extend(self.get_remembrance_day(year))
         return days
@@ -283,7 +283,7 @@ class Yukon(Canada, VictoriaDayMixin, ThanksgivingMixin):
     include_good_friday = True
 
     def get_variable_days(self, year):
-        days = super(Yukon, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_nth_weekday_in_month(year, 8, MON, 3), "Discovery Day"),
             (self.get_victoria_day(year)),
@@ -304,7 +304,7 @@ class NorthwestTerritories(Canada, RemembranceDayShiftMixin, VictoriaDayMixin,
     include_good_friday = True
 
     def get_variable_days(self, year):
-        days = super(NorthwestTerritories, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_victoria_day(year)),
             (self.get_thanksgiving(year)),
@@ -320,7 +320,7 @@ class Nunavut(Canada, VictoriaDayMixin, ThanksgivingMixin,
     include_good_friday = True
 
     def get_variable_days(self, year):
-        days = super(Nunavut, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_victoria_day(year)),
             (self.get_thanksgiving(year)),

diff --git a/workalendar/america/chile.py b/workalendar/america/chile.py
@@ -25,7 +25,7 @@ class Chile(WesternCalendar, ChristianMixin):
     include_immaculate_conception = True
 
     def get_variable_days(self, year):
-        days = super(Chile, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         september_17 = date(year, 9, 17)
         if september_17.weekday() == MON:
             days.append((september_17, '"Bridge" holiday'))

diff --git a/workalendar/america/colombia.py b/workalendar/america/colombia.py
@@ -57,7 +57,7 @@ def get_cartagena_independence(self, year):
         return Colombia.get_first_weekday_after(base_day, MON)
 
     def get_variable_days(self, year):
-        days = super(Colombia, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.extend([
             (self.get_epiphany(year), "Epiphany"),
             (self.get_saint_joseph(year), "Saint Joseph"),

diff --git a/workalendar/america/mexico.py b/workalendar/america/mexico.py
@@ -14,7 +14,7 @@ class Mexico(WesternCalendar, ChristianMixin):
     )
 
     def get_variable_days(self, year):
-        days = super(Mexico, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append(
             (Mexico.get_nth_weekday_in_month(year, 2, MON),
              "Constitution Day"))
@@ -30,7 +30,7 @@ def get_variable_days(self, year):
         return days
 
     def get_calendar_holidays(self, year):
-        days = super(Mexico, self).get_calendar_holidays(year)
+        days = super().get_calendar_holidays(year)
         # If any statutory day is on Sunday, the monday is off
         # If it's on a Saturday, the Friday is off
         for day, label in days:

diff --git a/workalendar/america/panama.py b/workalendar/america/panama.py
@@ -22,7 +22,7 @@ class Panama(WesternCalendar, ChristianMixin):
     )
 
     def get_variable_days(self, year):
-        days = super(Panama, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         days.append(
             (self.get_ash_wednesday(year) - timedelta(days=1), "Carnival")
         )

diff --git a/workalendar/america/paraguay.py b/workalendar/america/paraguay.py
@@ -66,7 +66,7 @@ def get_fixed_holidays(self, year):
         """
         Return fixed holidays for Paraguay.
         """
-        days = super(Paraguay, self).get_fixed_holidays(year)
+        days = super().get_fixed_holidays(year)
         days.append(self.get_heroes_day(year))
         days.append(self.get_founding_of_asuncion(year))
         days.append(self.get_boqueron_battle_victory_day(year))

diff --git a/workalendar/asia/china.py b/workalendar/asia/china.py
@@ -66,7 +66,7 @@ class China(ChineseNewYearCalendar, WesternCalendar):
     include_chinese_new_year_eve = True
 
     def __init__(self, *args, **kwargs):
-        super(China, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.extra_working_days = []
         for year, data in workdays.items():
             for holiday_name, day_list in data.items():
@@ -78,10 +78,10 @@ def get_calendar_holidays(self, year):
         if year not in holidays.keys():
             msg = "Need configure {} for China.".format(year)
             raise CalendarError(msg)
-        return super(China, self).get_calendar_holidays(year)
+        return super().get_calendar_holidays(year)
 
     def get_variable_days(self, year):
-        days = super(China, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         # Spring Festival, eve, 1.1, and 1.2 - 1.6 in lunar day
         for i in range(2, 7):
             days.append((ChineseNewYearCalendar.lunar(year, 1, i),
@@ -95,23 +95,22 @@ def get_variable_days(self, year):
     def is_working_day(self, day,
                        extra_working_days=None, extra_holidays=None):
         extra_working_days = extra_working_days or self.extra_working_days
-        return super(China, self).is_working_day(day, extra_working_days,
-                                                 extra_holidays)
+        return super().is_working_day(day, extra_working_days, extra_holidays)
 
     def add_working_days(self, day, delta,
                          extra_working_days=None, extra_holidays=None,
                          keep_datetime=False):
         extra_working_days = extra_working_days or self.extra_working_days
-        return super(China, self).add_working_days(day, delta,
-                                                   extra_working_days,
-                                                   extra_holidays,
-                                                   keep_datetime)
+        return super().add_working_days(day, delta,
+                                        extra_working_days,
+                                        extra_holidays,
+                                        keep_datetime)
 
     def sub_working_days(self, day, delta,
                          extra_working_days=None, extra_holidays=None,
                          keep_datetime=False):
         extra_working_days = extra_working_days or self.extra_working_days
-        return super(China, self).sub_working_days(day, delta,
-                                                   extra_working_days,
-                                                   extra_holidays,
-                                                   keep_datetime)
+        return super().sub_working_days(day, delta,
+                                        extra_working_days,
+                                        extra_holidays,
+                                        keep_datetime)
diff --git a/workalendar/asia/hong_kong.py b/workalendar/asia/hong_kong.py
@@ -39,7 +39,7 @@ def get_variable_days(self, year):
         if year < 2011:
             self.shift_start_cny_sunday = True
 
-        days = super(HongKong, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         chingming = solar_term(year, 15, 'Asia/Hong_Kong')
         dupe_holiday = [chingming for day in days if chingming == day[0]]
         if dupe_holiday:

diff --git a/workalendar/asia/israel.py b/workalendar/asia/israel.py
@@ -13,7 +13,7 @@ class Israel(Calendar):
     WEEKEND_DAYS = (SAT, FRI)
 
     def get_variable_days(self, year):
-        days = super(Israel, self).get_variable_days(year)
+        days = super().get_variable_days(year)
 
         delta = timedelta(days=1)
         current_date = date(year, 1, 1)

diff --git a/workalendar/asia/japan.py b/workalendar/asia/japan.py
@@ -24,7 +24,7 @@ def get_fixed_holidays(self, year):
         """
         Fixed holidays for Japan.
         """
-        days = super(Japan, self).get_fixed_holidays(year)
+        days = super().get_fixed_holidays(year)
         if year >= 2016:
             days.append((date(year, 8, 11), "Mountain Day"))
         # Change in Emperor
@@ -56,7 +56,7 @@ def get_fixed_holidays(self, year):
 
     def get_variable_days(self, year):
         # usual variable days
-        days = super(Japan, self).get_variable_days(year)
+        days = super().get_variable_days(year)
         equinoxes = calculate_equinoxes(year, 'Asia/Tokyo')
         coming_of_age_day = Japan.get_nth_weekday_in_month(year, 1, MON, 2)
         marine_day = Japan.get_nth_weekday_in_month(year, 7, MON, 3)

diff --git a/workalendar/asia/malaysia.py b/workalendar/asia/malaysia.py
@@ -63,7 +63,7 @@ def get_variable_days(self, year):
         """
         Malaysia variable days
         """
-        days = super(Malaysia, self).get_variable_days(year)
+        days = super().get_variable_days(year)
 
         # Vesak Day
         days.append(

diff --git a/workalendar/asia/singapore.py b/workalendar/asia/singapore.py
@@ -56,7 +56,7 @@ def get_variable_days(self, year):
         """
         Singapore variable days
         """
-        days = super(Singapore, self).get_variable_days(year)
+        days = super().get_variable_days(year)
 
         # Vesak Day
         days.append(