Restoring authorship annotation for <skazhenik@yandex-team.ru>. Commit 1 of 2.

12 files changed, 3037 insertions, 3037 deletions

diff --git a/contrib/python/dateutil/dateutil/_common.py b/contrib/python/dateutil/dateutil/_common.py
index 4eb2659bd2..bf45643d16 100644
--- a/contrib/python/dateutil/dateutil/_common.py
+++ b/contrib/python/dateutil/dateutil/_common.py
@@ -1,43 +1,43 @@
-"""
-Common code used in multiple modules.
-"""
-
-
-class weekday(object):
-    __slots__ = ["weekday", "n"]
-
-    def __init__(self, weekday, n=None):
-        self.weekday = weekday
-        self.n = n
-
-    def __call__(self, n):
-        if n == self.n:
-            return self
-        else:
-            return self.__class__(self.weekday, n)
-
-    def __eq__(self, other):
-        try:
-            if self.weekday != other.weekday or self.n != other.n:
-                return False
-        except AttributeError:
-            return False
-        return True
-
+""" 
+Common code used in multiple modules. 
+""" 
+ 
+ 
+class weekday(object): 
+    __slots__ = ["weekday", "n"] 
+ 
+    def __init__(self, weekday, n=None): 
+        self.weekday = weekday 
+        self.n = n 
+ 
+    def __call__(self, n): 
+        if n == self.n: 
+            return self 
+        else: 
+            return self.__class__(self.weekday, n) 
+ 
+    def __eq__(self, other): 
+        try: 
+            if self.weekday != other.weekday or self.n != other.n: 
+                return False 
+        except AttributeError: 
+            return False 
+        return True 
+ 
     def __hash__(self):
         return hash((
           self.weekday,
           self.n,
         ))
-
+ 
     def __ne__(self, other):
         return not (self == other)
 
-    def __repr__(self):
-        s = ("MO", "TU", "WE", "TH", "FR", "SA", "SU")[self.weekday]
-        if not self.n:
-            return s
-        else:
-            return "%s(%+d)" % (s, self.n)
+    def __repr__(self): 
+        s = ("MO", "TU", "WE", "TH", "FR", "SA", "SU")[self.weekday] 
+        if not self.n: 
+            return s 
+        else: 
+            return "%s(%+d)" % (s, self.n) 
 
 # vim:ts=4:sw=4:et
diff --git a/contrib/python/dateutil/dateutil/easter.py b/contrib/python/dateutil/dateutil/easter.py
index f74d1f7442..c1bbf12de2 100644
--- a/contrib/python/dateutil/dateutil/easter.py
+++ b/contrib/python/dateutil/dateutil/easter.py
@@ -33,9 +33,9 @@ def easter(year, method=EASTER_WESTERN):
 
     These methods are represented by the constants:
 
-    * ``EASTER_JULIAN   = 1``
-    * ``EASTER_ORTHODOX = 2``
-    * ``EASTER_WESTERN  = 3``
+    * ``EASTER_JULIAN   = 1`` 
+    * ``EASTER_ORTHODOX = 2`` 
+    * ``EASTER_WESTERN  = 3`` 
 
     The default method is method 3.
 
diff --git a/contrib/python/dateutil/dateutil/relativedelta.py b/contrib/python/dateutil/dateutil/relativedelta.py
index a9e85f7e6c..c1a343cfde 100644
--- a/contrib/python/dateutil/dateutil/relativedelta.py
+++ b/contrib/python/dateutil/dateutil/relativedelta.py
@@ -2,17 +2,17 @@
 import datetime
 import calendar
 
-import operator
-from math import copysign
-
+import operator 
+from math import copysign 
+ 
 from six import integer_types
-from warnings import warn
+from warnings import warn 
 
-from ._common import weekday
+from ._common import weekday 
 
-MO, TU, WE, TH, FR, SA, SU = weekdays = tuple(weekday(x) for x in range(7))
+MO, TU, WE, TH, FR, SA, SU = weekdays = tuple(weekday(x) for x in range(7)) 
 
-__all__ = ["relativedelta", "MO", "TU", "WE", "TH", "FR", "SA", "SU"]
+__all__ = ["relativedelta", "MO", "TU", "WE", "TH", "FR", "SA", "SU"] 
 
 
 class relativedelta(object):
@@ -24,29 +24,29 @@ class relativedelta(object):
     It is based on the specification of the excellent work done by M.-A. Lemburg
     in his
     `mx.DateTime <https://www.egenix.com/products/python/mxBase/mxDateTime/>`_ extension.
-    However, notice that this type does *NOT* implement the same algorithm as
-    his work. Do *NOT* expect it to behave like mx.DateTime's counterpart.
+    However, notice that this type does *NOT* implement the same algorithm as 
+    his work. Do *NOT* expect it to behave like mx.DateTime's counterpart. 
 
-    There are two different ways to build a relativedelta instance. The
-    first one is passing it two date/datetime classes::
+    There are two different ways to build a relativedelta instance. The 
+    first one is passing it two date/datetime classes:: 
 
-        relativedelta(datetime1, datetime2)
+        relativedelta(datetime1, datetime2) 
 
-    The second one is passing it any number of the following keyword arguments::
+    The second one is passing it any number of the following keyword arguments:: 
 
-        relativedelta(arg1=x,arg2=y,arg3=z...)
+        relativedelta(arg1=x,arg2=y,arg3=z...) 
 
-        year, month, day, hour, minute, second, microsecond:
-            Absolute information (argument is singular); adding or subtracting a
+        year, month, day, hour, minute, second, microsecond: 
+            Absolute information (argument is singular); adding or subtracting a 
             relativedelta with absolute information does not perform an arithmetic
-            operation, but rather REPLACES the corresponding value in the
-            original datetime with the value(s) in relativedelta.
+            operation, but rather REPLACES the corresponding value in the 
+            original datetime with the value(s) in relativedelta. 
 
-        years, months, weeks, days, hours, minutes, seconds, microseconds:
-            Relative information, may be negative (argument is plural); adding
-            or subtracting a relativedelta with relative information performs
+        years, months, weeks, days, hours, minutes, seconds, microseconds: 
+            Relative information, may be negative (argument is plural); adding 
+            or subtracting a relativedelta with relative information performs 
             the corresponding arithmetic operation on the original datetime value
-            with the information in the relativedelta.
+            with the information in the relativedelta. 
 
         weekday: 
             One of the weekday instances (MO, TU, etc) available in the
@@ -59,13 +59,13 @@ class relativedelta(object):
             it in combination with the day argument (e.g. day=1, MO(1) for first
             Monday of the month).
 
-        leapdays:
-            Will add given days to the date found, if year is a leap
-            year, and the date found is post 28 of february.
+        leapdays: 
+            Will add given days to the date found, if year is a leap 
+            year, and the date found is post 28 of february. 
 
-        yearday, nlyearday:
-            Set the yearday or the non-leap year day (jump leap days).
-            These are converted to day/month/leapdays information.
+        yearday, nlyearday: 
+            Set the yearday or the non-leap year day (jump leap days). 
+            These are converted to day/month/leapdays information. 
 
     There are relative and absolute forms of the keyword
     arguments. The plural is relative, and the singular is
@@ -99,7 +99,7 @@ class relativedelta(object):
     are added, to get to the 2nd day and 14th hour, finally the
     weekday is applied, but since the 2nd is already a Monday there is
     no effect.
-
+ 
     """
 
     def __init__(self, dt1=None, dt2=None,
@@ -108,22 +108,22 @@ class relativedelta(object):
                  year=None, month=None, day=None, weekday=None,
                  yearday=None, nlyearday=None,
                  hour=None, minute=None, second=None, microsecond=None):
-
+ 
         if dt1 and dt2:
-            # datetime is a subclass of date. So both must be date
+            # datetime is a subclass of date. So both must be date 
             if not (isinstance(dt1, datetime.date) and
                     isinstance(dt2, datetime.date)):
                 raise TypeError("relativedelta only diffs datetime/date")
-
-            # We allow two dates, or two datetimes, so we coerce them to be
-            # of the same type
-            if (isinstance(dt1, datetime.datetime) !=
-                    isinstance(dt2, datetime.datetime)):
+ 
+            # We allow two dates, or two datetimes, so we coerce them to be 
+            # of the same type 
+            if (isinstance(dt1, datetime.datetime) != 
+                    isinstance(dt2, datetime.datetime)): 
                 if not isinstance(dt1, datetime.datetime):
                     dt1 = datetime.datetime.fromordinal(dt1.toordinal())
                 elif not isinstance(dt2, datetime.datetime):
                     dt2 = datetime.datetime.fromordinal(dt2.toordinal())
-
+ 
             self.years = 0
             self.months = 0
             self.days = 0
@@ -142,30 +142,30 @@ class relativedelta(object):
             self.microsecond = None
             self._has_time = 0
 
-            # Get year / month delta between the two
-            months = (dt1.year - dt2.year) * 12 + (dt1.month - dt2.month)
+            # Get year / month delta between the two 
+            months = (dt1.year - dt2.year) * 12 + (dt1.month - dt2.month) 
             self._set_months(months)
-
-            # Remove the year/month delta so the timedelta is just well-defined
-            # time units (seconds, days and microseconds)
+ 
+            # Remove the year/month delta so the timedelta is just well-defined 
+            # time units (seconds, days and microseconds) 
             dtm = self.__radd__(dt2)
-
-            # If we've overshot our target, make an adjustment
+ 
+            # If we've overshot our target, make an adjustment 
             if dt1 < dt2:
-                compare = operator.gt
-                increment = 1
+                compare = operator.gt 
+                increment = 1 
             else:
-                compare = operator.lt
-                increment = -1
-
-            while compare(dt1, dtm):
-                months += increment
-                self._set_months(months)
-                dtm = self.__radd__(dt2)
-
-            # Get the timedelta between the "months-adjusted" date and dt1
+                compare = operator.lt 
+                increment = -1 
+ 
+            while compare(dt1, dtm): 
+                months += increment 
+                self._set_months(months) 
+                dtm = self.__radd__(dt2) 
+ 
+            # Get the timedelta between the "months-adjusted" date and dt1 
             delta = dt1 - dtm
-            self.seconds = delta.seconds + delta.days * 86400
+            self.seconds = delta.seconds + delta.days * 86400 
             self.microseconds = delta.microseconds
         else:
             # Check for non-integer values in integer-only quantities
@@ -173,17 +173,17 @@ class relativedelta(object):
                 raise ValueError("Non-integer years and months are "
                                  "ambiguous and not currently supported.")
 
-            # Relative information
+            # Relative information 
             self.years = int(years)
             self.months = int(months)
-            self.days = days + weeks * 7
+            self.days = days + weeks * 7 
             self.leapdays = leapdays
             self.hours = hours
             self.minutes = minutes
             self.seconds = seconds
             self.microseconds = microseconds
-
-            # Absolute information
+ 
+            # Absolute information 
             self.year = year
             self.month = month
             self.day = day
@@ -192,14 +192,14 @@ class relativedelta(object):
             self.second = second
             self.microsecond = microsecond
 
-            if any(x is not None and int(x) != x
-                   for x in (year, month, day, hour,
-                             minute, second, microsecond)):
-                # For now we'll deprecate floats - later it'll be an error.
-                warn("Non-integer value passed as absolute information. " +
-                     "This is not a well-defined condition and will raise " +
-                     "errors in future versions.", DeprecationWarning)
-
+            if any(x is not None and int(x) != x 
+                   for x in (year, month, day, hour, 
+                             minute, second, microsecond)): 
+                # For now we'll deprecate floats - later it'll be an error. 
+                warn("Non-integer value passed as absolute information. " + 
+                     "This is not a well-defined condition and will raise " + 
+                     "errors in future versions.", DeprecationWarning) 
+ 
             if isinstance(weekday, integer_types):
                 self.weekday = weekdays[weekday]
             else:
@@ -230,30 +230,30 @@ class relativedelta(object):
 
     def _fix(self):
         if abs(self.microseconds) > 999999:
-            s = _sign(self.microseconds)
-            div, mod = divmod(self.microseconds * s, 1000000)
-            self.microseconds = mod * s
-            self.seconds += div * s
+            s = _sign(self.microseconds) 
+            div, mod = divmod(self.microseconds * s, 1000000) 
+            self.microseconds = mod * s 
+            self.seconds += div * s 
         if abs(self.seconds) > 59:
-            s = _sign(self.seconds)
-            div, mod = divmod(self.seconds * s, 60)
-            self.seconds = mod * s
-            self.minutes += div * s
+            s = _sign(self.seconds) 
+            div, mod = divmod(self.seconds * s, 60) 
+            self.seconds = mod * s 
+            self.minutes += div * s 
         if abs(self.minutes) > 59:
-            s = _sign(self.minutes)
-            div, mod = divmod(self.minutes * s, 60)
-            self.minutes = mod * s
-            self.hours += div * s
+            s = _sign(self.minutes) 
+            div, mod = divmod(self.minutes * s, 60) 
+            self.minutes = mod * s 
+            self.hours += div * s 
         if abs(self.hours) > 23:
-            s = _sign(self.hours)
-            div, mod = divmod(self.hours * s, 24)
-            self.hours = mod * s
-            self.days += div * s
+            s = _sign(self.hours) 
+            div, mod = divmod(self.hours * s, 24) 
+            self.hours = mod * s 
+            self.days += div * s 
         if abs(self.months) > 11:
-            s = _sign(self.months)
-            div, mod = divmod(self.months * s, 12)
-            self.months = mod * s
-            self.years += div * s
+            s = _sign(self.months) 
+            div, mod = divmod(self.months * s, 12) 
+            self.months = mod * s 
+            self.years += div * s 
         if (self.hours or self.minutes or self.seconds or self.microseconds
                 or self.hour is not None or self.minute is not None or
                 self.second is not None or self.microsecond is not None):
@@ -261,106 +261,106 @@ class relativedelta(object):
         else:
             self._has_time = 0
 
-    @property
-    def weeks(self):
+    @property 
+    def weeks(self): 
         return int(self.days / 7.0)
-
-    @weeks.setter
-    def weeks(self, value):
-        self.days = self.days - (self.weeks * 7) + value * 7
-
+ 
+    @weeks.setter 
+    def weeks(self, value): 
+        self.days = self.days - (self.weeks * 7) + value * 7 
+ 
     def _set_months(self, months):
         self.months = months
         if abs(self.months) > 11:
-            s = _sign(self.months)
-            div, mod = divmod(self.months * s, 12)
-            self.months = mod * s
-            self.years = div * s
+            s = _sign(self.months) 
+            div, mod = divmod(self.months * s, 12) 
+            self.months = mod * s 
+            self.years = div * s 
         else:
             self.years = 0
 
-    def normalized(self):
-        """
-        Return a version of this object represented entirely using integer
-        values for the relative attributes.
-
-        >>> relativedelta(days=1.5, hours=2).normalized()
+    def normalized(self): 
+        """ 
+        Return a version of this object represented entirely using integer 
+        values for the relative attributes. 
+ 
+        >>> relativedelta(days=1.5, hours=2).normalized() 
         relativedelta(days=+1, hours=+14)
-
-        :return:
-            Returns a :class:`dateutil.relativedelta.relativedelta` object.
-        """
-        # Cascade remainders down (rounding each to roughly nearest microsecond)
-        days = int(self.days)
-
-        hours_f = round(self.hours + 24 * (self.days - days), 11)
-        hours = int(hours_f)
-
-        minutes_f = round(self.minutes + 60 * (hours_f - hours), 10)
-        minutes = int(minutes_f)
-
-        seconds_f = round(self.seconds + 60 * (minutes_f - minutes), 8)
-        seconds = int(seconds_f)
-
-        microseconds = round(self.microseconds + 1e6 * (seconds_f - seconds))
-
-        # Constructor carries overflow back up with call to _fix()
-        return self.__class__(years=self.years, months=self.months,
-                              days=days, hours=hours, minutes=minutes,
-                              seconds=seconds, microseconds=microseconds,
-                              leapdays=self.leapdays, year=self.year,
-                              month=self.month, day=self.day,
-                              weekday=self.weekday, hour=self.hour,
-                              minute=self.minute, second=self.second,
-                              microsecond=self.microsecond)
-
+ 
+        :return: 
+            Returns a :class:`dateutil.relativedelta.relativedelta` object. 
+        """ 
+        # Cascade remainders down (rounding each to roughly nearest microsecond) 
+        days = int(self.days) 
+ 
+        hours_f = round(self.hours + 24 * (self.days - days), 11) 
+        hours = int(hours_f) 
+ 
+        minutes_f = round(self.minutes + 60 * (hours_f - hours), 10) 
+        minutes = int(minutes_f) 
+ 
+        seconds_f = round(self.seconds + 60 * (minutes_f - minutes), 8) 
+        seconds = int(seconds_f) 
+ 
+        microseconds = round(self.microseconds + 1e6 * (seconds_f - seconds)) 
+ 
+        # Constructor carries overflow back up with call to _fix() 
+        return self.__class__(years=self.years, months=self.months, 
+                              days=days, hours=hours, minutes=minutes, 
+                              seconds=seconds, microseconds=microseconds, 
+                              leapdays=self.leapdays, year=self.year, 
+                              month=self.month, day=self.day, 
+                              weekday=self.weekday, hour=self.hour, 
+                              minute=self.minute, second=self.second, 
+                              microsecond=self.microsecond) 
+ 
     def __add__(self, other):
         if isinstance(other, relativedelta):
-            return self.__class__(years=other.years + self.years,
-                                 months=other.months + self.months,
-                                 days=other.days + self.days,
-                                 hours=other.hours + self.hours,
-                                 minutes=other.minutes + self.minutes,
-                                 seconds=other.seconds + self.seconds,
+            return self.__class__(years=other.years + self.years, 
+                                 months=other.months + self.months, 
+                                 days=other.days + self.days, 
+                                 hours=other.hours + self.hours, 
+                                 minutes=other.minutes + self.minutes, 
+                                 seconds=other.seconds + self.seconds, 
                                  microseconds=(other.microseconds +
                                                self.microseconds),
                                  leapdays=other.leapdays or self.leapdays,
-                                 year=(other.year if other.year is not None
-                                       else self.year),
-                                 month=(other.month if other.month is not None
-                                        else self.month),
-                                 day=(other.day if other.day is not None
-                                      else self.day),
-                                 weekday=(other.weekday if other.weekday is not None
-                                          else self.weekday),
-                                 hour=(other.hour if other.hour is not None
-                                       else self.hour),
-                                 minute=(other.minute if other.minute is not None
-                                         else self.minute),
-                                 second=(other.second if other.second is not None
-                                         else self.second),
-                                 microsecond=(other.microsecond if other.microsecond
-                                              is not None else
+                                 year=(other.year if other.year is not None 
+                                       else self.year), 
+                                 month=(other.month if other.month is not None 
+                                        else self.month), 
+                                 day=(other.day if other.day is not None 
+                                      else self.day), 
+                                 weekday=(other.weekday if other.weekday is not None 
+                                          else self.weekday), 
+                                 hour=(other.hour if other.hour is not None 
+                                       else self.hour), 
+                                 minute=(other.minute if other.minute is not None 
+                                         else self.minute), 
+                                 second=(other.second if other.second is not None 
+                                         else self.second), 
+                                 microsecond=(other.microsecond if other.microsecond 
+                                              is not None else 
                                               self.microsecond))
-        if isinstance(other, datetime.timedelta):
-            return self.__class__(years=self.years,
-                                  months=self.months,
-                                  days=self.days + other.days,
-                                  hours=self.hours,
-                                  minutes=self.minutes,
-                                  seconds=self.seconds + other.seconds,
-                                  microseconds=self.microseconds + other.microseconds,
-                                  leapdays=self.leapdays,
-                                  year=self.year,
-                                  month=self.month,
-                                  day=self.day,
-                                  weekday=self.weekday,
-                                  hour=self.hour,
-                                  minute=self.minute,
-                                  second=self.second,
-                                  microsecond=self.microsecond)
+        if isinstance(other, datetime.timedelta): 
+            return self.__class__(years=self.years, 
+                                  months=self.months, 
+                                  days=self.days + other.days, 
+                                  hours=self.hours, 
+                                  minutes=self.minutes, 
+                                  seconds=self.seconds + other.seconds, 
+                                  microseconds=self.microseconds + other.microseconds, 
+                                  leapdays=self.leapdays, 
+                                  year=self.year, 
+                                  month=self.month, 
+                                  day=self.day, 
+                                  weekday=self.weekday, 
+                                  hour=self.hour, 
+                                  minute=self.minute, 
+                                  second=self.second, 
+                                  microsecond=self.microsecond) 
         if not isinstance(other, datetime.date):
-            return NotImplemented
+            return NotImplemented 
         elif self._has_time and not isinstance(other, datetime.datetime):
             other = datetime.datetime.fromordinal(other.toordinal())
         year = (self.year or other.year)+self.years
@@ -392,11 +392,11 @@ class relativedelta(object):
                                     microseconds=self.microseconds))
         if self.weekday:
             weekday, nth = self.weekday.weekday, self.weekday.n or 1
-            jumpdays = (abs(nth) - 1) * 7
+            jumpdays = (abs(nth) - 1) * 7 
             if nth > 0:
-                jumpdays += (7 - ret.weekday() + weekday) % 7
+                jumpdays += (7 - ret.weekday() + weekday) % 7 
             else:
-                jumpdays += (ret.weekday() - weekday) % 7
+                jumpdays += (ret.weekday() - weekday) % 7 
                 jumpdays *= -1
             ret += datetime.timedelta(days=jumpdays)
         return ret
@@ -409,32 +409,32 @@ class relativedelta(object):
 
     def __sub__(self, other):
         if not isinstance(other, relativedelta):
-            return NotImplemented   # In case the other object defines __rsub__
-        return self.__class__(years=self.years - other.years,
-                             months=self.months - other.months,
-                             days=self.days - other.days,
-                             hours=self.hours - other.hours,
-                             minutes=self.minutes - other.minutes,
-                             seconds=self.seconds - other.seconds,
-                             microseconds=self.microseconds - other.microseconds,
+            return NotImplemented   # In case the other object defines __rsub__ 
+        return self.__class__(years=self.years - other.years, 
+                             months=self.months - other.months, 
+                             days=self.days - other.days, 
+                             hours=self.hours - other.hours, 
+                             minutes=self.minutes - other.minutes, 
+                             seconds=self.seconds - other.seconds, 
+                             microseconds=self.microseconds - other.microseconds, 
                              leapdays=self.leapdays or other.leapdays,
-                             year=(self.year if self.year is not None
-                                   else other.year),
-                             month=(self.month if self.month is not None else
-                                    other.month),
-                             day=(self.day if self.day is not None else
-                                  other.day),
-                             weekday=(self.weekday if self.weekday is not None else
-                                      other.weekday),
-                             hour=(self.hour if self.hour is not None else
-                                   other.hour),
-                             minute=(self.minute if self.minute is not None else
-                                     other.minute),
-                             second=(self.second if self.second is not None else
-                                     other.second),
-                             microsecond=(self.microsecond if self.microsecond
-                                          is not None else
-                                          other.microsecond))
+                             year=(self.year if self.year is not None 
+                                   else other.year), 
+                             month=(self.month if self.month is not None else 
+                                    other.month), 
+                             day=(self.day if self.day is not None else 
+                                  other.day), 
+                             weekday=(self.weekday if self.weekday is not None else 
+                                      other.weekday), 
+                             hour=(self.hour if self.hour is not None else 
+                                   other.hour), 
+                             minute=(self.minute if self.minute is not None else 
+                                     other.minute), 
+                             second=(self.second if self.second is not None else 
+                                     other.second), 
+                             microsecond=(self.microsecond if self.microsecond 
+                                          is not None else 
+                                          other.microsecond)) 
 
     def __abs__(self):
         return self.__class__(years=abs(self.years),
@@ -455,7 +455,7 @@ class relativedelta(object):
                               microsecond=self.microsecond)
 
     def __neg__(self):
-        return self.__class__(years=-self.years,
+        return self.__class__(years=-self.years, 
                              months=-self.months,
                              days=-self.days,
                              hours=-self.hours,
@@ -489,22 +489,22 @@ class relativedelta(object):
                     self.minute is None and
                     self.second is None and
                     self.microsecond is None)
-    # Compatibility with Python 2.x
-    __nonzero__ = __bool__
+    # Compatibility with Python 2.x 
+    __nonzero__ = __bool__ 
 
     def __mul__(self, other):
-        try:
-            f = float(other)
-        except TypeError:
-            return NotImplemented
-
-        return self.__class__(years=int(self.years * f),
-                             months=int(self.months * f),
-                             days=int(self.days * f),
-                             hours=int(self.hours * f),
-                             minutes=int(self.minutes * f),
-                             seconds=int(self.seconds * f),
-                             microseconds=int(self.microseconds * f),
+        try: 
+            f = float(other) 
+        except TypeError: 
+            return NotImplemented 
+ 
+        return self.__class__(years=int(self.years * f), 
+                             months=int(self.months * f), 
+                             days=int(self.days * f), 
+                             hours=int(self.hours * f), 
+                             minutes=int(self.minutes * f), 
+                             seconds=int(self.seconds * f), 
+                             microseconds=int(self.microseconds * f), 
                              leapdays=self.leapdays,
                              year=self.year,
                              month=self.month,
@@ -519,7 +519,7 @@ class relativedelta(object):
 
     def __eq__(self, other):
         if not isinstance(other, relativedelta):
-            return NotImplemented
+            return NotImplemented 
         if self.weekday or other.weekday:
             if not self.weekday or not other.weekday:
                 return False
@@ -534,7 +534,7 @@ class relativedelta(object):
                 self.hours == other.hours and
                 self.minutes == other.minutes and
                 self.seconds == other.seconds and
-                self.microseconds == other.microseconds and
+                self.microseconds == other.microseconds and 
                 self.leapdays == other.leapdays and
                 self.year == other.year and
                 self.month == other.month and
@@ -563,18 +563,18 @@ class relativedelta(object):
             self.second,
             self.microsecond,
         ))
-
+ 
     def __ne__(self, other):
         return not self.__eq__(other)
 
     def __div__(self, other):
-        try:
-            reciprocal = 1 / float(other)
-        except TypeError:
-            return NotImplemented
-
-        return self.__mul__(reciprocal)
+        try: 
+            reciprocal = 1 / float(other) 
+        except TypeError: 
+            return NotImplemented 
 
+        return self.__mul__(reciprocal) 
+ 
     __truediv__ = __div__
 
     def __repr__(self):
@@ -583,17 +583,17 @@ class relativedelta(object):
                      "hours", "minutes", "seconds", "microseconds"]:
             value = getattr(self, attr)
             if value:
-                l.append("{attr}={value:+g}".format(attr=attr, value=value))
+                l.append("{attr}={value:+g}".format(attr=attr, value=value)) 
         for attr in ["year", "month", "day", "weekday",
                      "hour", "minute", "second", "microsecond"]:
             value = getattr(self, attr)
             if value is not None:
-                l.append("{attr}={value}".format(attr=attr, value=repr(value)))
-        return "{classname}({attrs})".format(classname=self.__class__.__name__,
-                                             attrs=", ".join(l))
-
-
-def _sign(x):
-    return int(copysign(1, x))
-
+                l.append("{attr}={value}".format(attr=attr, value=repr(value))) 
+        return "{classname}({attrs})".format(classname=self.__class__.__name__, 
+                                             attrs=", ".join(l)) 
+
+ 
+def _sign(x): 
+    return int(copysign(1, x)) 
+ 
 # vim:ts=4:sw=4:et
diff --git a/contrib/python/dateutil/dateutil/rrule.py b/contrib/python/dateutil/dateutil/rrule.py
index b3203393c6..5798cc424f 100644
--- a/contrib/python/dateutil/dateutil/rrule.py
+++ b/contrib/python/dateutil/dateutil/rrule.py
@@ -16,16 +16,16 @@ from functools import wraps
 from warnings import warn
 
 from six import advance_iterator, integer_types
+ 
+from six.moves import _thread, range 
 
-from six.moves import _thread, range
-
-from ._common import weekday as weekdaybase
-
+from ._common import weekday as weekdaybase 
+ 
 try:
     from math import gcd
 except ImportError:
     from fractions import gcd
-
+ 
 __all__ = ["rrule", "rruleset", "rrulestr",
            "YEARLY", "MONTHLY", "WEEKLY", "DAILY",
            "HOURLY", "MINUTELY", "SECONDLY",
@@ -48,8 +48,8 @@ del M29, M30, M31, M365MASK[59], MDAY365MASK[59], NMDAY365MASK[31]
 MDAY365MASK = tuple(MDAY365MASK)
 M365MASK = tuple(M365MASK)
 
-FREQNAMES = ['YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY', 'HOURLY', 'MINUTELY', 'SECONDLY']
-
+FREQNAMES = ['YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY', 'HOURLY', 'MINUTELY', 'SECONDLY'] 
+ 
 (YEARLY,
  MONTHLY,
  WEEKLY,
@@ -63,44 +63,44 @@ easter = None
 parser = None
 
 
-class weekday(weekdaybase):
-    """
-    This version of weekday does not allow n = 0.
-    """
-    def __init__(self, wkday, n=None):
+class weekday(weekdaybase): 
+    """ 
+    This version of weekday does not allow n = 0. 
+    """ 
+    def __init__(self, wkday, n=None): 
         if n == 0:
-            raise ValueError("Can't create weekday with n==0")
+            raise ValueError("Can't create weekday with n==0") 
 
-        super(weekday, self).__init__(wkday, n)
+        super(weekday, self).__init__(wkday, n) 
 
 
-MO, TU, WE, TH, FR, SA, SU = weekdays = tuple(weekday(x) for x in range(7))
+MO, TU, WE, TH, FR, SA, SU = weekdays = tuple(weekday(x) for x in range(7)) 
 
 
-def _invalidates_cache(f):
-    """
-    Decorator for rruleset methods which may invalidate the
-    cached length.
-    """
+def _invalidates_cache(f): 
+    """ 
+    Decorator for rruleset methods which may invalidate the 
+    cached length. 
+    """ 
     @wraps(f)
-    def inner_func(self, *args, **kwargs):
-        rv = f(self, *args, **kwargs)
-        self._invalidate_cache()
-        return rv
-
-    return inner_func
-
-
+    def inner_func(self, *args, **kwargs): 
+        rv = f(self, *args, **kwargs) 
+        self._invalidate_cache() 
+        return rv 
+
+    return inner_func 
+ 
+ 
 class rrulebase(object):
     def __init__(self, cache=False):
         if cache:
             self._cache = []
             self._cache_lock = _thread.allocate_lock()
-            self._invalidate_cache()
+            self._invalidate_cache() 
         else:
             self._cache = None
             self._cache_complete = False
-            self._len = None
+            self._len = None 
 
     def __iter__(self):
         if self._cache_complete:
@@ -110,17 +110,17 @@ class rrulebase(object):
         else:
             return self._iter_cached()
 
-    def _invalidate_cache(self):
-        if self._cache is not None:
-            self._cache = []
-            self._cache_complete = False
-            self._cache_gen = self._iter()
-
-            if self._cache_lock.locked():
-                self._cache_lock.release()
-
-        self._len = None
-
+    def _invalidate_cache(self): 
+        if self._cache is not None: 
+            self._cache = [] 
+            self._cache_complete = False 
+            self._cache_gen = self._iter() 
+ 
+            if self._cache_lock.locked(): 
+                self._cache_lock.release() 
+ 
+        self._len = None 
+ 
     def _iter_cached(self):
         i = 0
         gen = self._cache_gen
@@ -227,48 +227,48 @@ class rrulebase(object):
                     return i
         return None
 
-    def xafter(self, dt, count=None, inc=False):
-        """
-        Generator which yields up to `count` recurrences after the given
-        datetime instance, equivalent to `after`.
-
-        :param dt:
-            The datetime at which to start generating recurrences.
-
-        :param count:
-            The maximum number of recurrences to generate. If `None` (default),
-            dates are generated until the recurrence rule is exhausted.
-
-        :param inc:
-            If `dt` is an instance of the rule and `inc` is `True`, it is
-            included in the output.
-
-        :yields: Yields a sequence of `datetime` objects.
-        """
-
-        if self._cache_complete:
-            gen = self._cache
-        else:
-            gen = self
-
-        # Select the comparison function
-        if inc:
-            comp = lambda dc, dtc: dc >= dtc
-        else:
-            comp = lambda dc, dtc: dc > dtc
-
-        # Generate dates
-        n = 0
-        for d in gen:
-            if comp(d, dt):
-                if count is not None:
-                    n += 1
-                    if n > count:
-                        break
-
-                yield d
-
-    def between(self, after, before, inc=False, count=1):
+    def xafter(self, dt, count=None, inc=False): 
+        """ 
+        Generator which yields up to `count` recurrences after the given 
+        datetime instance, equivalent to `after`. 
+ 
+        :param dt: 
+            The datetime at which to start generating recurrences. 
+ 
+        :param count: 
+            The maximum number of recurrences to generate. If `None` (default), 
+            dates are generated until the recurrence rule is exhausted. 
+ 
+        :param inc: 
+            If `dt` is an instance of the rule and `inc` is `True`, it is 
+            included in the output. 
+ 
+        :yields: Yields a sequence of `datetime` objects. 
+        """ 
+ 
+        if self._cache_complete: 
+            gen = self._cache 
+        else: 
+            gen = self 
+ 
+        # Select the comparison function 
+        if inc: 
+            comp = lambda dc, dtc: dc >= dtc 
+        else: 
+            comp = lambda dc, dtc: dc > dtc 
+ 
+        # Generate dates 
+        n = 0 
+        for d in gen: 
+            if comp(d, dt): 
+                if count is not None: 
+                    n += 1 
+                    if n > count: 
+                        break 
+ 
+                yield d 
+ 
+    def between(self, after, before, inc=False, count=1): 
         """ Returns all the occurrences of the rrule between after and before.
         The inc keyword defines what happens if after and/or before are
         themselves occurrences. With inc=True, they will be included in the
@@ -313,29 +313,29 @@ class rrule(rrulebase):
     Where freq must be one of YEARLY, MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY,
     or SECONDLY.
 
-    .. note::
-        Per RFC section 3.3.10, recurrence instances falling on invalid dates
-        and times are ignored rather than coerced:
-
-            Recurrence rules may generate recurrence instances with an invalid
-            date (e.g., February 30) or nonexistent local time (e.g., 1:30 AM
-            on a day where the local time is moved forward by an hour at 1:00
-            AM).  Such recurrence instances MUST be ignored and MUST NOT be
-            counted as part of the recurrence set.
-
-        This can lead to possibly surprising behavior when, for example, the
-        start date occurs at the end of the month:
-
-        >>> from dateutil.rrule import rrule, MONTHLY
-        >>> from datetime import datetime
-        >>> start_date = datetime(2014, 12, 31)
-        >>> list(rrule(freq=MONTHLY, count=4, dtstart=start_date))
-        ... # doctest: +NORMALIZE_WHITESPACE
-        [datetime.datetime(2014, 12, 31, 0, 0),
-         datetime.datetime(2015, 1, 31, 0, 0),
-         datetime.datetime(2015, 3, 31, 0, 0),
-         datetime.datetime(2015, 5, 31, 0, 0)]
-
+    .. note:: 
+        Per RFC section 3.3.10, recurrence instances falling on invalid dates 
+        and times are ignored rather than coerced: 
+ 
+            Recurrence rules may generate recurrence instances with an invalid 
+            date (e.g., February 30) or nonexistent local time (e.g., 1:30 AM 
+            on a day where the local time is moved forward by an hour at 1:00 
+            AM).  Such recurrence instances MUST be ignored and MUST NOT be 
+            counted as part of the recurrence set. 
+ 
+        This can lead to possibly surprising behavior when, for example, the 
+        start date occurs at the end of the month: 
+ 
+        >>> from dateutil.rrule import rrule, MONTHLY 
+        >>> from datetime import datetime 
+        >>> start_date = datetime(2014, 12, 31) 
+        >>> list(rrule(freq=MONTHLY, count=4, dtstart=start_date)) 
+        ... # doctest: +NORMALIZE_WHITESPACE 
+        [datetime.datetime(2014, 12, 31, 0, 0), 
+         datetime.datetime(2015, 1, 31, 0, 0), 
+         datetime.datetime(2015, 3, 31, 0, 0), 
+         datetime.datetime(2015, 5, 31, 0, 0)] 
+ 
     Additionally, it supports the following keyword arguments:
 
     :param dtstart:
@@ -355,8 +355,8 @@ class rrule(rrulebase):
         calendar.setfirstweekday().
     :param count:
         If given, this determines how many occurrences will be generated.
-
-        .. note::
+ 
+        .. note:: 
             As of version 2.5.0, the use of the keyword ``until`` in conjunction
             with ``count`` is deprecated, to make sure ``dateutil`` is fully
             compliant with `RFC-5545 Sec. 3.3.10 <https://tools.ietf.org/
@@ -364,11 +364,11 @@ class rrule(rrulebase):
             **must not** occur in the same call to ``rrule``.
     :param until:
         If given, this must be a datetime instance specifying the upper-bound
-        limit of the recurrence. The last recurrence in the rule is the greatest
-        datetime that is less than or equal to the value specified in the
-        ``until`` parameter.
-
-        .. note::
+        limit of the recurrence. The last recurrence in the rule is the greatest 
+        datetime that is less than or equal to the value specified in the 
+        ``until`` parameter. 
+ 
+        .. note:: 
             As of version 2.5.0, the use of the keyword ``until`` in conjunction
             with ``count`` is deprecated, to make sure ``dateutil`` is fully
             compliant with `RFC-5545 Sec. 3.3.10 <https://tools.ietf.org/
@@ -447,17 +447,17 @@ class rrule(rrulebase):
         self._freq = freq
         self._interval = interval
         self._count = count
-
-        # Cache the original byxxx rules, if they are provided, as the _byxxx
-        # attributes do not necessarily map to the inputs, and this can be
-        # a problem in generating the strings. Only store things if they've
-        # been supplied (the string retrieval will just use .get())
-        self._original_rule = {}
-
+ 
+        # Cache the original byxxx rules, if they are provided, as the _byxxx 
+        # attributes do not necessarily map to the inputs, and this can be 
+        # a problem in generating the strings. Only store things if they've 
+        # been supplied (the string retrieval will just use .get()) 
+        self._original_rule = {} 
+ 
         if until and not isinstance(until, datetime.datetime):
             until = datetime.datetime.fromordinal(until.toordinal())
         self._until = until
-
+ 
         if self._dtstart and self._until:
             if (self._dtstart.tzinfo is not None) != (self._until.tzinfo is not None):
                 # According to RFC5545 Section 3.3.10:
@@ -472,18 +472,18 @@ class rrule(rrulebase):
                     'is timezone-aware'
                 )
 
-        if count is not None and until:
+        if count is not None and until: 
             warn("Using both 'count' and 'until' is inconsistent with RFC 5545"
-                 " and has been deprecated in dateutil. Future versions will "
-                 "raise an error.", DeprecationWarning)
-
+                 " and has been deprecated in dateutil. Future versions will " 
+                 "raise an error.", DeprecationWarning) 
+ 
         if wkst is None:
             self._wkst = calendar.firstweekday()
         elif isinstance(wkst, integer_types):
             self._wkst = wkst
         else:
             self._wkst = wkst.weekday
-
+ 
         if bysetpos is None:
             self._bysetpos = None
         elif isinstance(bysetpos, integer_types):
@@ -497,47 +497,47 @@ class rrule(rrulebase):
                 if pos == 0 or not (-366 <= pos <= 366):
                     raise ValueError("bysetpos must be between 1 and 366, "
                                      "or between -366 and -1")
-
-        if self._bysetpos:
-            self._original_rule['bysetpos'] = self._bysetpos
-
-        if (byweekno is None and byyearday is None and bymonthday is None and
-                byweekday is None and byeaster is None):
+ 
+        if self._bysetpos: 
+            self._original_rule['bysetpos'] = self._bysetpos 
+ 
+        if (byweekno is None and byyearday is None and bymonthday is None and 
+                byweekday is None and byeaster is None): 
             if freq == YEARLY:
-                if bymonth is None:
+                if bymonth is None: 
                     bymonth = dtstart.month
-                    self._original_rule['bymonth'] = None
+                    self._original_rule['bymonth'] = None 
                 bymonthday = dtstart.day
-                self._original_rule['bymonthday'] = None
+                self._original_rule['bymonthday'] = None 
             elif freq == MONTHLY:
                 bymonthday = dtstart.day
-                self._original_rule['bymonthday'] = None
+                self._original_rule['bymonthday'] = None 
             elif freq == WEEKLY:
                 byweekday = dtstart.weekday()
-                self._original_rule['byweekday'] = None
-
+                self._original_rule['byweekday'] = None 
+ 
         # bymonth
-        if bymonth is None:
+        if bymonth is None: 
             self._bymonth = None
         else:
-            if isinstance(bymonth, integer_types):
-                bymonth = (bymonth,)
-
-            self._bymonth = tuple(sorted(set(bymonth)))
-
-            if 'bymonth' not in self._original_rule:
-                self._original_rule['bymonth'] = self._bymonth
-
+            if isinstance(bymonth, integer_types): 
+                bymonth = (bymonth,) 
+ 
+            self._bymonth = tuple(sorted(set(bymonth))) 
+ 
+            if 'bymonth' not in self._original_rule: 
+                self._original_rule['bymonth'] = self._bymonth 
+ 
         # byyearday
-        if byyearday is None:
+        if byyearday is None: 
             self._byyearday = None
         else:
-            if isinstance(byyearday, integer_types):
-                byyearday = (byyearday,)
-
-            self._byyearday = tuple(sorted(set(byyearday)))
-            self._original_rule['byyearday'] = self._byyearday
-
+            if isinstance(byyearday, integer_types): 
+                byyearday = (byyearday,) 
+ 
+            self._byyearday = tuple(sorted(set(byyearday))) 
+            self._original_rule['byyearday'] = self._byyearday 
+ 
         # byeaster
         if byeaster is not None:
             if not easter:
@@ -545,83 +545,83 @@ class rrule(rrulebase):
             if isinstance(byeaster, integer_types):
                 self._byeaster = (byeaster,)
             else:
-                self._byeaster = tuple(sorted(byeaster))
-
-            self._original_rule['byeaster'] = self._byeaster
+                self._byeaster = tuple(sorted(byeaster)) 
+ 
+            self._original_rule['byeaster'] = self._byeaster 
         else:
             self._byeaster = None
-
-        # bymonthday
-        if bymonthday is None:
+ 
+        # bymonthday 
+        if bymonthday is None: 
             self._bymonthday = ()
             self._bynmonthday = ()
         else:
-            if isinstance(bymonthday, integer_types):
-                bymonthday = (bymonthday,)
-
-            bymonthday = set(bymonthday)            # Ensure it's unique
-
-            self._bymonthday = tuple(sorted(x for x in bymonthday if x > 0))
-            self._bynmonthday = tuple(sorted(x for x in bymonthday if x < 0))
-
-            # Storing positive numbers first, then negative numbers
-            if 'bymonthday' not in self._original_rule:
-                self._original_rule['bymonthday'] = tuple(
-                    itertools.chain(self._bymonthday, self._bynmonthday))
-
+            if isinstance(bymonthday, integer_types): 
+                bymonthday = (bymonthday,) 
+ 
+            bymonthday = set(bymonthday)            # Ensure it's unique 
+ 
+            self._bymonthday = tuple(sorted(x for x in bymonthday if x > 0)) 
+            self._bynmonthday = tuple(sorted(x for x in bymonthday if x < 0)) 
+ 
+            # Storing positive numbers first, then negative numbers 
+            if 'bymonthday' not in self._original_rule: 
+                self._original_rule['bymonthday'] = tuple( 
+                    itertools.chain(self._bymonthday, self._bynmonthday)) 
+ 
         # byweekno
         if byweekno is None:
             self._byweekno = None
         else:
-            if isinstance(byweekno, integer_types):
-                byweekno = (byweekno,)
-
-            self._byweekno = tuple(sorted(set(byweekno)))
-
-            self._original_rule['byweekno'] = self._byweekno
-
+            if isinstance(byweekno, integer_types): 
+                byweekno = (byweekno,) 
+ 
+            self._byweekno = tuple(sorted(set(byweekno))) 
+ 
+            self._original_rule['byweekno'] = self._byweekno 
+ 
         # byweekday / bynweekday
         if byweekday is None:
             self._byweekday = None
             self._bynweekday = None
         else:
-            # If it's one of the valid non-sequence types, convert to a
-            # single-element sequence before the iterator that builds the
-            # byweekday set.
-            if isinstance(byweekday, integer_types) or hasattr(byweekday, "n"):
-                byweekday = (byweekday,)
-
-            self._byweekday = set()
-            self._bynweekday = set()
+            # If it's one of the valid non-sequence types, convert to a 
+            # single-element sequence before the iterator that builds the 
+            # byweekday set. 
+            if isinstance(byweekday, integer_types) or hasattr(byweekday, "n"): 
+                byweekday = (byweekday,) 
+ 
+            self._byweekday = set() 
+            self._bynweekday = set() 
             for wday in byweekday:
                 if isinstance(wday, integer_types):
-                    self._byweekday.add(wday)
+                    self._byweekday.add(wday) 
                 elif not wday.n or freq > MONTHLY:
-                    self._byweekday.add(wday.weekday)
+                    self._byweekday.add(wday.weekday) 
                 else:
-                    self._bynweekday.add((wday.weekday, wday.n))
-
+                    self._bynweekday.add((wday.weekday, wday.n)) 
+ 
             if not self._byweekday:
                 self._byweekday = None
             elif not self._bynweekday:
                 self._bynweekday = None
-
-            if self._byweekday is not None:
-                self._byweekday = tuple(sorted(self._byweekday))
-                orig_byweekday = [weekday(x) for x in self._byweekday]
-            else:
+ 
+            if self._byweekday is not None: 
+                self._byweekday = tuple(sorted(self._byweekday)) 
+                orig_byweekday = [weekday(x) for x in self._byweekday] 
+            else: 
                 orig_byweekday = ()
-
-            if self._bynweekday is not None:
-                self._bynweekday = tuple(sorted(self._bynweekday))
-                orig_bynweekday = [weekday(*x) for x in self._bynweekday]
-            else:
+ 
+            if self._bynweekday is not None: 
+                self._bynweekday = tuple(sorted(self._bynweekday)) 
+                orig_bynweekday = [weekday(*x) for x in self._bynweekday] 
+            else: 
                 orig_bynweekday = ()
-
-            if 'byweekday' not in self._original_rule:
-                self._original_rule['byweekday'] = tuple(itertools.chain(
-                    orig_byweekday, orig_bynweekday))
-
+ 
+            if 'byweekday' not in self._original_rule: 
+                self._original_rule['byweekday'] = tuple(itertools.chain( 
+                    orig_byweekday, orig_bynweekday)) 
+ 
         # byhour
         if byhour is None:
             if freq < HOURLY:
@@ -629,19 +629,19 @@ class rrule(rrulebase):
             else:
                 self._byhour = None
         else:
-            if isinstance(byhour, integer_types):
-                byhour = (byhour,)
-
-            if freq == HOURLY:
-                self._byhour = self.__construct_byset(start=dtstart.hour,
-                                                      byxxx=byhour,
-                                                      base=24)
-            else:
-                self._byhour = set(byhour)
-
-            self._byhour = tuple(sorted(self._byhour))
-            self._original_rule['byhour'] = self._byhour
-
+            if isinstance(byhour, integer_types): 
+                byhour = (byhour,) 
+ 
+            if freq == HOURLY: 
+                self._byhour = self.__construct_byset(start=dtstart.hour, 
+                                                      byxxx=byhour, 
+                                                      base=24) 
+            else: 
+                self._byhour = set(byhour) 
+ 
+            self._byhour = tuple(sorted(self._byhour)) 
+            self._original_rule['byhour'] = self._byhour 
+ 
         # byminute
         if byminute is None:
             if freq < MINUTELY:
@@ -649,41 +649,41 @@ class rrule(rrulebase):
             else:
                 self._byminute = None
         else:
-            if isinstance(byminute, integer_types):
-                byminute = (byminute,)
-
-            if freq == MINUTELY:
-                self._byminute = self.__construct_byset(start=dtstart.minute,
-                                                        byxxx=byminute,
-                                                        base=60)
-            else:
-                self._byminute = set(byminute)
-
-            self._byminute = tuple(sorted(self._byminute))
-            self._original_rule['byminute'] = self._byminute
-
+            if isinstance(byminute, integer_types): 
+                byminute = (byminute,) 
+ 
+            if freq == MINUTELY: 
+                self._byminute = self.__construct_byset(start=dtstart.minute, 
+                                                        byxxx=byminute, 
+                                                        base=60) 
+            else: 
+                self._byminute = set(byminute) 
+ 
+            self._byminute = tuple(sorted(self._byminute)) 
+            self._original_rule['byminute'] = self._byminute 
+ 
         # bysecond
         if bysecond is None:
             if freq < SECONDLY:
-                self._bysecond = ((dtstart.second,))
+                self._bysecond = ((dtstart.second,)) 
             else:
                 self._bysecond = None
         else:
-            if isinstance(bysecond, integer_types):
-                bysecond = (bysecond,)
-
-            self._bysecond = set(bysecond)
-
-            if freq == SECONDLY:
-                self._bysecond = self.__construct_byset(start=dtstart.second,
-                                                        byxxx=bysecond,
-                                                        base=60)
-            else:
-                self._bysecond = set(bysecond)
-
-            self._bysecond = tuple(sorted(self._bysecond))
-            self._original_rule['bysecond'] = self._bysecond
-
+            if isinstance(bysecond, integer_types): 
+                bysecond = (bysecond,) 
+
+            self._bysecond = set(bysecond) 
+ 
+            if freq == SECONDLY: 
+                self._bysecond = self.__construct_byset(start=dtstart.second, 
+                                                        byxxx=bysecond, 
+                                                        base=60) 
+            else: 
+                self._bysecond = set(bysecond) 
+ 
+            self._bysecond = tuple(sorted(self._bysecond)) 
+            self._original_rule['bysecond'] = self._bysecond 
+ 
         if self._freq >= HOURLY:
             self._timeset = None
         else:
@@ -697,82 +697,82 @@ class rrule(rrulebase):
             self._timeset.sort()
             self._timeset = tuple(self._timeset)
 
-    def __str__(self):
-        """
-        Output a string that would generate this RRULE if passed to rrulestr.
+    def __str__(self): 
+        """ 
+        Output a string that would generate this RRULE if passed to rrulestr. 
         This is mostly compatible with RFC5545, except for the
-        dateutil-specific extension BYEASTER.
-        """
-
-        output = []
-        h, m, s = [None] * 3
-        if self._dtstart:
-            output.append(self._dtstart.strftime('DTSTART:%Y%m%dT%H%M%S'))
-            h, m, s = self._dtstart.timetuple()[3:6]
-
-        parts = ['FREQ=' + FREQNAMES[self._freq]]
-        if self._interval != 1:
-            parts.append('INTERVAL=' + str(self._interval))
-
-        if self._wkst:
-            parts.append('WKST=' + repr(weekday(self._wkst))[0:2])
-
-        if self._count is not None:
-            parts.append('COUNT=' + str(self._count))
-
-        if self._until:
-            parts.append(self._until.strftime('UNTIL=%Y%m%dT%H%M%S'))
-
-        if self._original_rule.get('byweekday') is not None:
-            # The str() method on weekday objects doesn't generate
+        dateutil-specific extension BYEASTER. 
+        """ 
+ 
+        output = [] 
+        h, m, s = [None] * 3 
+        if self._dtstart: 
+            output.append(self._dtstart.strftime('DTSTART:%Y%m%dT%H%M%S')) 
+            h, m, s = self._dtstart.timetuple()[3:6] 
+ 
+        parts = ['FREQ=' + FREQNAMES[self._freq]] 
+        if self._interval != 1: 
+            parts.append('INTERVAL=' + str(self._interval)) 
+ 
+        if self._wkst: 
+            parts.append('WKST=' + repr(weekday(self._wkst))[0:2]) 
+ 
+        if self._count is not None: 
+            parts.append('COUNT=' + str(self._count)) 
+ 
+        if self._until: 
+            parts.append(self._until.strftime('UNTIL=%Y%m%dT%H%M%S')) 
+ 
+        if self._original_rule.get('byweekday') is not None: 
+            # The str() method on weekday objects doesn't generate 
             # RFC5545-compliant strings, so we should modify that.
-            original_rule = dict(self._original_rule)
-            wday_strings = []
-            for wday in original_rule['byweekday']:
-                if wday.n:
-                    wday_strings.append('{n:+d}{wday}'.format(
-                        n=wday.n,
-                        wday=repr(wday)[0:2]))
-                else:
-                    wday_strings.append(repr(wday))
-
-            original_rule['byweekday'] = wday_strings
-        else:
-            original_rule = self._original_rule
-
-        partfmt = '{name}={vals}'
-        for name, key in [('BYSETPOS', 'bysetpos'),
-                          ('BYMONTH', 'bymonth'),
-                          ('BYMONTHDAY', 'bymonthday'),
-                          ('BYYEARDAY', 'byyearday'),
-                          ('BYWEEKNO', 'byweekno'),
-                          ('BYDAY', 'byweekday'),
-                          ('BYHOUR', 'byhour'),
-                          ('BYMINUTE', 'byminute'),
-                          ('BYSECOND', 'bysecond'),
-                          ('BYEASTER', 'byeaster')]:
-            value = original_rule.get(key)
-            if value:
-                parts.append(partfmt.format(name=name, vals=(','.join(str(v)
-                                                             for v in value))))
-
+            original_rule = dict(self._original_rule) 
+            wday_strings = [] 
+            for wday in original_rule['byweekday']: 
+                if wday.n: 
+                    wday_strings.append('{n:+d}{wday}'.format( 
+                        n=wday.n, 
+                        wday=repr(wday)[0:2])) 
+                else: 
+                    wday_strings.append(repr(wday)) 
+ 
+            original_rule['byweekday'] = wday_strings 
+        else: 
+            original_rule = self._original_rule 
+ 
+        partfmt = '{name}={vals}' 
+        for name, key in [('BYSETPOS', 'bysetpos'), 
+                          ('BYMONTH', 'bymonth'), 
+                          ('BYMONTHDAY', 'bymonthday'), 
+                          ('BYYEARDAY', 'byyearday'), 
+                          ('BYWEEKNO', 'byweekno'), 
+                          ('BYDAY', 'byweekday'), 
+                          ('BYHOUR', 'byhour'), 
+                          ('BYMINUTE', 'byminute'), 
+                          ('BYSECOND', 'bysecond'), 
+                          ('BYEASTER', 'byeaster')]: 
+            value = original_rule.get(key) 
+            if value: 
+                parts.append(partfmt.format(name=name, vals=(','.join(str(v) 
+                                                             for v in value)))) 
+ 
         output.append('RRULE:' + ';'.join(parts))
-        return '\n'.join(output)
-
-    def replace(self, **kwargs):
-        """Return new rrule with same attributes except for those attributes given new
-           values by whichever keyword arguments are specified."""
-        new_kwargs = {"interval": self._interval,
-                      "count": self._count,
-                      "dtstart": self._dtstart,
-                      "freq": self._freq,
-                      "until": self._until,
-                      "wkst": self._wkst,
-                      "cache": False if self._cache is None else True }
-        new_kwargs.update(self._original_rule)
-        new_kwargs.update(kwargs)
-        return rrule(**new_kwargs)
-
+        return '\n'.join(output) 
+ 
+    def replace(self, **kwargs): 
+        """Return new rrule with same attributes except for those attributes given new 
+           values by whichever keyword arguments are specified.""" 
+        new_kwargs = {"interval": self._interval, 
+                      "count": self._count, 
+                      "dtstart": self._dtstart, 
+                      "freq": self._freq, 
+                      "until": self._until, 
+                      "wkst": self._wkst, 
+                      "cache": False if self._cache is None else True } 
+        new_kwargs.update(self._original_rule) 
+        new_kwargs.update(kwargs) 
+        return rrule(**new_kwargs) 
+ 
     def _iter(self):
         year, month, day, hour, minute, second, weekday, yearday, _ = \
             self._dtstart.timetuple()
@@ -871,32 +871,32 @@ class rrule(rrulebase):
                         self._len = total
                         return
                     elif res >= self._dtstart:
-                        if count is not None:
+                        if count is not None: 
                             count -= 1
-                            if count < 0:
+                            if count < 0: 
                                 self._len = total
                                 return
-                        total += 1
-                        yield res
+                        total += 1 
+                        yield res 
             else:
                 for i in dayset[start:end]:
                     if i is not None:
-                        date = datetime.date.fromordinal(ii.yearordinal + i)
+                        date = datetime.date.fromordinal(ii.yearordinal + i) 
                         for time in timeset:
                             res = datetime.datetime.combine(date, time)
                             if until and res > until:
                                 self._len = total
                                 return
                             elif res >= self._dtstart:
-                                if count is not None:
+                                if count is not None: 
                                     count -= 1
-                                    if count < 0:
+                                    if count < 0: 
                                         self._len = total
                                         return
 
-                                total += 1
-                                yield res
-
+                                total += 1 
+                                yield res 
+ 
             # Handle frequency and interval
             fixday = False
             if freq == YEARLY:
@@ -932,86 +932,86 @@ class rrule(rrulebase):
                 if filtered:
                     # Jump to one iteration before next day
                     hour += ((23-hour)//interval)*interval
-
-                if byhour:
-                    ndays, hour = self.__mod_distance(value=hour,
-                                                      byxxx=self._byhour,
-                                                      base=24)
-                else:
-                    ndays, hour = divmod(hour+interval, 24)
-
-                if ndays:
-                    day += ndays
-                    fixday = True
-
-                timeset = gettimeset(hour, minute, second)
-            elif freq == MINUTELY:
-                if filtered:
-                    # Jump to one iteration before next day
-                    minute += ((1439-(hour*60+minute))//interval)*interval
-
-                valid = False
-                rep_rate = (24*60)
-                for j in range(rep_rate // gcd(interval, rep_rate)):
-                    if byminute:
-                        nhours, minute = \
-                            self.__mod_distance(value=minute,
-                                                byxxx=self._byminute,
-                                                base=60)
-                    else:
-                        nhours, minute = divmod(minute+interval, 60)
-
-                    div, hour = divmod(hour+nhours, 24)
+ 
+                if byhour: 
+                    ndays, hour = self.__mod_distance(value=hour, 
+                                                      byxxx=self._byhour, 
+                                                      base=24) 
+                else: 
+                    ndays, hour = divmod(hour+interval, 24) 
+ 
+                if ndays: 
+                    day += ndays 
+                    fixday = True 
+ 
+                timeset = gettimeset(hour, minute, second) 
+            elif freq == MINUTELY: 
+                if filtered: 
+                    # Jump to one iteration before next day 
+                    minute += ((1439-(hour*60+minute))//interval)*interval 
+ 
+                valid = False 
+                rep_rate = (24*60) 
+                for j in range(rep_rate // gcd(interval, rep_rate)): 
+                    if byminute: 
+                        nhours, minute = \ 
+                            self.__mod_distance(value=minute, 
+                                                byxxx=self._byminute, 
+                                                base=60) 
+                    else: 
+                        nhours, minute = divmod(minute+interval, 60) 
+ 
+                    div, hour = divmod(hour+nhours, 24) 
                     if div:
                         day += div
                         fixday = True
-                        filtered = False
-
+                        filtered = False 
+ 
                     if not byhour or hour in byhour:
-                        valid = True
+                        valid = True 
                         break
-
-                if not valid:
-                    raise ValueError('Invalid combination of interval and ' +
-                                     'byhour resulting in empty rule.')
-
+ 
+                if not valid: 
+                    raise ValueError('Invalid combination of interval and ' + 
+                                     'byhour resulting in empty rule.') 
+ 
                 timeset = gettimeset(hour, minute, second)
-            elif freq == SECONDLY:
+            elif freq == SECONDLY: 
                 if filtered:
                     # Jump to one iteration before next day
-                    second += (((86399 - (hour * 3600 + minute * 60 + second))
-                                // interval) * interval)
-
-                rep_rate = (24 * 3600)
-                valid = False
-                for j in range(0, rep_rate // gcd(interval, rep_rate)):
-                    if bysecond:
-                        nminutes, second = \
-                            self.__mod_distance(value=second,
-                                                byxxx=self._bysecond,
-                                                base=60)
-                    else:
-                        nminutes, second = divmod(second+interval, 60)
-
-                    div, minute = divmod(minute+nminutes, 60)
+                    second += (((86399 - (hour * 3600 + minute * 60 + second)) 
+                                // interval) * interval) 
+ 
+                rep_rate = (24 * 3600) 
+                valid = False 
+                for j in range(0, rep_rate // gcd(interval, rep_rate)): 
+                    if bysecond: 
+                        nminutes, second = \ 
+                            self.__mod_distance(value=second, 
+                                                byxxx=self._bysecond, 
+                                                base=60) 
+                    else: 
+                        nminutes, second = divmod(second+interval, 60) 
+ 
+                    div, minute = divmod(minute+nminutes, 60) 
                     if div:
                         hour += div
-                        div, hour = divmod(hour, 24)
+                        div, hour = divmod(hour, 24) 
                         if div:
                             day += div
                             fixday = True
-
+ 
                     if ((not byhour or hour in byhour) and
                             (not byminute or minute in byminute) and
                             (not bysecond or second in bysecond)):
-                        valid = True
+                        valid = True 
                         break
-
-                if not valid:
-                    raise ValueError('Invalid combination of interval, ' +
-                                     'byhour and byminute resulting in empty' +
-                                     ' rule.')
-
+ 
+                if not valid: 
+                    raise ValueError('Invalid combination of interval, ' + 
+                                     'byhour and byminute resulting in empty' + 
+                                     ' rule.') 
+ 
                 timeset = gettimeset(hour, minute, second)
 
             if fixday and day > 28:
@@ -1029,86 +1029,86 @@ class rrule(rrulebase):
                         daysinmonth = calendar.monthrange(year, month)[1]
                     ii.rebuild(year, month)
 
-    def __construct_byset(self, start, byxxx, base):
-        """
-        If a `BYXXX` sequence is passed to the constructor at the same level as
-        `FREQ` (e.g. `FREQ=HOURLY,BYHOUR={2,4,7},INTERVAL=3`), there are some
-        specifications which cannot be reached given some starting conditions.
-
-        This occurs whenever the interval is not coprime with the base of a
-        given unit and the difference between the starting position and the
-        ending position is not coprime with the greatest common denominator
-        between the interval and the base. For example, with a FREQ of hourly
-        starting at 17:00 and an interval of 4, the only valid values for
-        BYHOUR would be {21, 1, 5, 9, 13, 17}, because 4 and 24 are not
-        coprime.
-
-        :param start:
-            Specifies the starting position.
-        :param byxxx:
-            An iterable containing the list of allowed values.
-        :param base:
-            The largest allowable value for the specified frequency (e.g.
-            24 hours, 60 minutes).
-
-        This does not preserve the type of the iterable, returning a set, since
-        the values should be unique and the order is irrelevant, this will
-        speed up later lookups.
-
-        In the event of an empty set, raises a :exception:`ValueError`, as this
-        results in an empty rrule.
-        """
-
-        cset = set()
-
-        # Support a single byxxx value.
-        if isinstance(byxxx, integer_types):
-            byxxx = (byxxx, )
-
-        for num in byxxx:
-            i_gcd = gcd(self._interval, base)
-            # Use divmod rather than % because we need to wrap negative nums.
-            if i_gcd == 1 or divmod(num - start, i_gcd)[1] == 0:
-                cset.add(num)
-
-        if len(cset) == 0:
-            raise ValueError("Invalid rrule byxxx generates an empty set.")
-
-        return cset
-
-    def __mod_distance(self, value, byxxx, base):
-        """
-        Calculates the next value in a sequence where the `FREQ` parameter is
-        specified along with a `BYXXX` parameter at the same "level"
-        (e.g. `HOURLY` specified with `BYHOUR`).
-
-        :param value:
-            The old value of the component.
-        :param byxxx:
-            The `BYXXX` set, which should have been generated by
-            `rrule._construct_byset`, or something else which checks that a
-            valid rule is present.
-        :param base:
-            The largest allowable value for the specified frequency (e.g.
-            24 hours, 60 minutes).
-
-        If a valid value is not found after `base` iterations (the maximum
-        number before the sequence would start to repeat), this raises a
-        :exception:`ValueError`, as no valid values were found.
-
-        This returns a tuple of `divmod(n*interval, base)`, where `n` is the
-        smallest number of `interval` repetitions until the next specified
-        value in `byxxx` is found.
-        """
-        accumulator = 0
-        for ii in range(1, base + 1):
-            # Using divmod() over % to account for negative intervals
-            div, value = divmod(value + self._interval, base)
-            accumulator += div
-            if value in byxxx:
-                return (accumulator, value)
-
-
+    def __construct_byset(self, start, byxxx, base): 
+        """ 
+        If a `BYXXX` sequence is passed to the constructor at the same level as 
+        `FREQ` (e.g. `FREQ=HOURLY,BYHOUR={2,4,7},INTERVAL=3`), there are some 
+        specifications which cannot be reached given some starting conditions. 
+
+        This occurs whenever the interval is not coprime with the base of a 
+        given unit and the difference between the starting position and the 
+        ending position is not coprime with the greatest common denominator 
+        between the interval and the base. For example, with a FREQ of hourly 
+        starting at 17:00 and an interval of 4, the only valid values for 
+        BYHOUR would be {21, 1, 5, 9, 13, 17}, because 4 and 24 are not 
+        coprime. 
+ 
+        :param start: 
+            Specifies the starting position. 
+        :param byxxx: 
+            An iterable containing the list of allowed values. 
+        :param base: 
+            The largest allowable value for the specified frequency (e.g. 
+            24 hours, 60 minutes). 
+ 
+        This does not preserve the type of the iterable, returning a set, since 
+        the values should be unique and the order is irrelevant, this will 
+        speed up later lookups. 
+ 
+        In the event of an empty set, raises a :exception:`ValueError`, as this 
+        results in an empty rrule. 
+        """ 
+ 
+        cset = set() 
+ 
+        # Support a single byxxx value. 
+        if isinstance(byxxx, integer_types): 
+            byxxx = (byxxx, ) 
+ 
+        for num in byxxx: 
+            i_gcd = gcd(self._interval, base) 
+            # Use divmod rather than % because we need to wrap negative nums. 
+            if i_gcd == 1 or divmod(num - start, i_gcd)[1] == 0: 
+                cset.add(num) 
+ 
+        if len(cset) == 0: 
+            raise ValueError("Invalid rrule byxxx generates an empty set.") 
+ 
+        return cset 
+ 
+    def __mod_distance(self, value, byxxx, base): 
+        """ 
+        Calculates the next value in a sequence where the `FREQ` parameter is 
+        specified along with a `BYXXX` parameter at the same "level" 
+        (e.g. `HOURLY` specified with `BYHOUR`). 
+ 
+        :param value: 
+            The old value of the component. 
+        :param byxxx: 
+            The `BYXXX` set, which should have been generated by 
+            `rrule._construct_byset`, or something else which checks that a 
+            valid rule is present. 
+        :param base: 
+            The largest allowable value for the specified frequency (e.g. 
+            24 hours, 60 minutes). 
+ 
+        If a valid value is not found after `base` iterations (the maximum 
+        number before the sequence would start to repeat), this raises a 
+        :exception:`ValueError`, as no valid values were found. 
+ 
+        This returns a tuple of `divmod(n*interval, base)`, where `n` is the 
+        smallest number of `interval` repetitions until the next specified 
+        value in `byxxx` is found. 
+        """ 
+        accumulator = 0 
+        for ii in range(1, base + 1): 
+            # Using divmod() over % to account for negative intervals 
+            div, value = divmod(value + self._interval, base) 
+            accumulator += div 
+            if value in byxxx: 
+                return (accumulator, value) 
+ 
+ 
 class _iterinfo(object):
     __slots__ = ["rrule", "lastyear", "lastmonth",
                  "yearlen", "nextyearlen", "yearordinal", "yearweekday",
@@ -1124,8 +1124,8 @@ class _iterinfo(object):
         # Every mask is 7 days longer to handle cross-year weekly periods.
         rr = self.rrule
         if year != self.lastyear:
-            self.yearlen = 365 + calendar.isleap(year)
-            self.nextyearlen = 365 + calendar.isleap(year + 1)
+            self.yearlen = 365 + calendar.isleap(year) 
+            self.nextyearlen = 365 + calendar.isleap(year + 1) 
             firstyday = datetime.date(year, 1, 1)
             self.yearordinal = firstyday.toordinal()
             self.yearweekday = firstyday.weekday()
@@ -1254,50 +1254,50 @@ class _iterinfo(object):
         return list(range(self.yearlen)), 0, self.yearlen
 
     def mdayset(self, year, month, day):
-        dset = [None]*self.yearlen
+        dset = [None]*self.yearlen 
         start, end = self.mrange[month-1:month+1]
         for i in range(start, end):
-            dset[i] = i
-        return dset, start, end
+            dset[i] = i 
+        return dset, start, end 
 
     def wdayset(self, year, month, day):
         # We need to handle cross-year weeks here.
-        dset = [None]*(self.yearlen+7)
+        dset = [None]*(self.yearlen+7) 
         i = datetime.date(year, month, day).toordinal()-self.yearordinal
         start = i
         for j in range(7):
-            dset[i] = i
+            dset[i] = i 
             i += 1
             # if (not (0 <= i < self.yearlen) or
             #    self.wdaymask[i] == self.rrule._wkst):
             # This will cross the year boundary, if necessary.
             if self.wdaymask[i] == self.rrule._wkst:
                 break
-        return dset, start, i
+        return dset, start, i 
 
     def ddayset(self, year, month, day):
-        dset = [None] * self.yearlen
-        i = datetime.date(year, month, day).toordinal() - self.yearordinal
-        dset[i] = i
-        return dset, i, i + 1
+        dset = [None] * self.yearlen 
+        i = datetime.date(year, month, day).toordinal() - self.yearordinal 
+        dset[i] = i 
+        return dset, i, i + 1 
 
     def htimeset(self, hour, minute, second):
-        tset = []
+        tset = [] 
         rr = self.rrule
         for minute in rr._byminute:
             for second in rr._bysecond:
-                tset.append(datetime.time(hour, minute, second,
-                                          tzinfo=rr._tzinfo))
-        tset.sort()
-        return tset
+                tset.append(datetime.time(hour, minute, second, 
+                                          tzinfo=rr._tzinfo)) 
+        tset.sort() 
+        return tset 
 
     def mtimeset(self, hour, minute, second):
-        tset = []
+        tset = [] 
         rr = self.rrule
         for second in rr._bysecond:
-            tset.append(datetime.time(hour, minute, second, tzinfo=rr._tzinfo))
-        tset.sort()
-        return tset
+            tset.append(datetime.time(hour, minute, second, tzinfo=rr._tzinfo)) 
+        tset.sort() 
+        return tset 
 
     def stimeset(self, hour, minute, second):
         return (datetime.time(hour, minute, second,
@@ -1326,11 +1326,11 @@ class rruleset(rrulebase):
             try:
                 self.dt = advance_iterator(self.gen)
             except StopIteration:
-                if self.genlist[0] is self:
-                    heapq.heappop(self.genlist)
-                else:
-                    self.genlist.remove(self)
-                    heapq.heapify(self.genlist)
+                if self.genlist[0] is self: 
+                    heapq.heappop(self.genlist) 
+                else: 
+                    self.genlist.remove(self) 
+                    heapq.heapify(self.genlist) 
 
         next = __next__
 
@@ -1353,19 +1353,19 @@ class rruleset(rrulebase):
         self._exrule = []
         self._exdate = []
 
-    @_invalidates_cache
+    @_invalidates_cache 
     def rrule(self, rrule):
         """ Include the given :py:class:`rrule` instance in the recurrence set
             generation. """
         self._rrule.append(rrule)
 
-    @_invalidates_cache
+    @_invalidates_cache 
     def rdate(self, rdate):
         """ Include the given :py:class:`datetime` instance in the recurrence
             set generation. """
         self._rdate.append(rdate)
 
-    @_invalidates_cache
+    @_invalidates_cache 
     def exrule(self, exrule):
         """ Include the given rrule instance in the recurrence set exclusion
             list. Dates which are part of the given recurrence rules will not
@@ -1373,7 +1373,7 @@ class rruleset(rrulebase):
         """
         self._exrule.append(exrule)
 
-    @_invalidates_cache
+    @_invalidates_cache 
     def exdate(self, exdate):
         """ Include the given datetime instance in the recurrence set
             exclusion list. Dates included that way will not be generated,
@@ -1393,23 +1393,23 @@ class rruleset(rrulebase):
             self._genitem(exlist, gen)
         lastdt = None
         total = 0
-        heapq.heapify(rlist)
-        heapq.heapify(exlist)
+        heapq.heapify(rlist) 
+        heapq.heapify(exlist) 
         while rlist:
             ritem = rlist[0]
             if not lastdt or lastdt != ritem.dt:
                 while exlist and exlist[0] < ritem:
-                    exitem = exlist[0]
-                    advance_iterator(exitem)
-                    if exlist and exlist[0] is exitem:
-                        heapq.heapreplace(exlist, exitem)
+                    exitem = exlist[0] 
+                    advance_iterator(exitem) 
+                    if exlist and exlist[0] is exitem: 
+                        heapq.heapreplace(exlist, exitem) 
                 if not exlist or ritem != exlist[0]:
                     total += 1
                     yield ritem.dt
                 lastdt = ritem.dt
             advance_iterator(ritem)
-            if rlist and rlist[0] is ritem:
-                heapq.heapreplace(rlist, ritem)
+            if rlist and rlist[0] is ritem: 
+                heapq.heapreplace(rlist, ritem) 
         self._len = total
 
 
@@ -1506,29 +1506,29 @@ class _rrulestr(object):
     def _handle_WKST(self, rrkwargs, name, value, **kwargs):
         rrkwargs["wkst"] = self._weekday_map[value]
 
-    def _handle_BYWEEKDAY(self, rrkwargs, name, value, **kwargs):
-        """
-        Two ways to specify this: +1MO or MO(+1)
-        """
+    def _handle_BYWEEKDAY(self, rrkwargs, name, value, **kwargs): 
+        """ 
+        Two ways to specify this: +1MO or MO(+1) 
+        """ 
         l = []
         for wday in value.split(','):
-            if '(' in wday:
-                # If it's of the form TH(+1), etc.
-                splt = wday.split('(')
-                w = splt[0]
-                n = int(splt[1][:-1])
-            elif len(wday):
-                # If it's of the form +1MO
-                for i in range(len(wday)):
-                    if wday[i] not in '+-0123456789':
-                        break
-                n = wday[:i] or None
-                w = wday[i:]
-                if n:
-                    n = int(n)
-            else:
-                raise ValueError("Invalid (empty) BYDAY specification.")
-
+            if '(' in wday: 
+                # If it's of the form TH(+1), etc. 
+                splt = wday.split('(') 
+                w = splt[0] 
+                n = int(splt[1][:-1]) 
+            elif len(wday): 
+                # If it's of the form +1MO 
+                for i in range(len(wday)): 
+                    if wday[i] not in '+-0123456789': 
+                        break 
+                n = wday[:i] or None 
+                w = wday[i:] 
+                if n: 
+                    n = int(n) 
+            else: 
+                raise ValueError("Invalid (empty) BYDAY specification.") 
+ 
             l.append(weekdays[self._weekday_map[w]](n))
         rrkwargs["byweekday"] = l
 
@@ -1702,25 +1702,25 @@ class _rrulestr(object):
                     or exrulevals or exdatevals):
                 if not parser and (rdatevals or exdatevals):
                     from dateutil import parser
-                rset = rruleset(cache=cache)
+                rset = rruleset(cache=cache) 
                 for value in rrulevals:
-                    rset.rrule(self._parse_rfc_rrule(value, dtstart=dtstart,
-                                                     ignoretz=ignoretz,
-                                                     tzinfos=tzinfos))
+                    rset.rrule(self._parse_rfc_rrule(value, dtstart=dtstart, 
+                                                     ignoretz=ignoretz, 
+                                                     tzinfos=tzinfos)) 
                 for value in rdatevals:
                     for datestr in value.split(','):
-                        rset.rdate(parser.parse(datestr,
-                                                ignoretz=ignoretz,
-                                                tzinfos=tzinfos))
+                        rset.rdate(parser.parse(datestr, 
+                                                ignoretz=ignoretz, 
+                                                tzinfos=tzinfos)) 
                 for value in exrulevals:
-                    rset.exrule(self._parse_rfc_rrule(value, dtstart=dtstart,
-                                                      ignoretz=ignoretz,
-                                                      tzinfos=tzinfos))
+                    rset.exrule(self._parse_rfc_rrule(value, dtstart=dtstart, 
+                                                      ignoretz=ignoretz, 
+                                                      tzinfos=tzinfos)) 
                 for value in exdatevals:
                     rset.exdate(value)
                 if compatible and dtstart:
-                    rset.rdate(dtstart)
-                return rset
+                    rset.rdate(dtstart) 
+                return rset 
             else:
                 return self._parse_rfc_rrule(rrulevals[0],
                                              dtstart=dtstart,
@@ -1731,7 +1731,7 @@ class _rrulestr(object):
     def __call__(self, s, **kwargs):
         return self._parse_rfc(s, **kwargs)
 
-
+ 
 rrulestr = _rrulestr()
 
 # vim:ts=4:sw=4:et
diff --git a/contrib/python/dateutil/dateutil/tz/__init__.py b/contrib/python/dateutil/dateutil/tz/__init__.py
index af1352c472..20f305bac0 100644
--- a/contrib/python/dateutil/dateutil/tz/__init__.py
+++ b/contrib/python/dateutil/dateutil/tz/__init__.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-from .tz import *
+from .tz import * 
 from .tz import __doc__
-
-__all__ = ["tzutc", "tzoffset", "tzlocal", "tzfile", "tzrange",
-           "tzstr", "tzical", "tzwin", "tzwinlocal", "gettz",
+ 
+__all__ = ["tzutc", "tzoffset", "tzlocal", "tzfile", "tzrange", 
+           "tzstr", "tzical", "tzwin", "tzwinlocal", "gettz", 
            "enfold", "datetime_ambiguous", "datetime_exists",
            "resolve_imaginary", "UTC", "DeprecatedTzFormatWarning"]
 
diff --git a/contrib/python/dateutil/dateutil/tz/_common.py b/contrib/python/dateutil/dateutil/tz/_common.py
index e6ac118315..36506c9b90 100644
--- a/contrib/python/dateutil/dateutil/tz/_common.py
+++ b/contrib/python/dateutil/dateutil/tz/_common.py
@@ -1,70 +1,70 @@
 from six import PY2
-
-from functools import wraps
-
-from datetime import datetime, timedelta, tzinfo
-
-
-ZERO = timedelta(0)
-
-__all__ = ['tzname_in_python2', 'enfold']
-
-
-def tzname_in_python2(namefunc):
-    """Change unicode output into bytestrings in Python 2
-
-    tzname() API changed in Python 3. It used to return bytes, but was changed
-    to unicode strings
-    """
+ 
+from functools import wraps 
+ 
+from datetime import datetime, timedelta, tzinfo 
+ 
+ 
+ZERO = timedelta(0) 
+ 
+__all__ = ['tzname_in_python2', 'enfold'] 
+ 
+ 
+def tzname_in_python2(namefunc): 
+    """Change unicode output into bytestrings in Python 2 
+ 
+    tzname() API changed in Python 3. It used to return bytes, but was changed 
+    to unicode strings 
+    """ 
     if PY2:
         @wraps(namefunc)
         def adjust_encoding(*args, **kwargs):
             name = namefunc(*args, **kwargs)
             if name is not None:
                 name = name.encode()
-
+ 
             return name
-
+ 
         return adjust_encoding
     else:
         return namefunc
-
-
-# The following is adapted from Alexander Belopolsky's tz library
-# https://github.com/abalkin/tz
-if hasattr(datetime, 'fold'):
-    # This is the pre-python 3.6 fold situation
-    def enfold(dt, fold=1):
-        """
-        Provides a unified interface for assigning the ``fold`` attribute to
-        datetimes both before and after the implementation of PEP-495.
-
-        :param fold:
-            The value for the ``fold`` attribute in the returned datetime. This
-            should be either 0 or 1.
-
-        :return:
-            Returns an object for which ``getattr(dt, 'fold', 0)`` returns
-            ``fold`` for all versions of Python. In versions prior to
-            Python 3.6, this is a ``_DatetimeWithFold`` object, which is a
-            subclass of :py:class:`datetime.datetime` with the ``fold``
-            attribute added, if ``fold`` is 1.
-
-        .. versionadded:: 2.6.0
-        """
-        return dt.replace(fold=fold)
-
-else:
-    class _DatetimeWithFold(datetime):
-        """
-        This is a class designed to provide a PEP 495-compliant interface for
-        Python versions before 3.6. It is used only for dates in a fold, so
-        the ``fold`` attribute is fixed at ``1``.
-
-        .. versionadded:: 2.6.0
-        """
-        __slots__ = ()
-
+ 
+ 
+# The following is adapted from Alexander Belopolsky's tz library 
+# https://github.com/abalkin/tz 
+if hasattr(datetime, 'fold'): 
+    # This is the pre-python 3.6 fold situation 
+    def enfold(dt, fold=1): 
+        """ 
+        Provides a unified interface for assigning the ``fold`` attribute to 
+        datetimes both before and after the implementation of PEP-495. 
+ 
+        :param fold: 
+            The value for the ``fold`` attribute in the returned datetime. This 
+            should be either 0 or 1. 
+ 
+        :return: 
+            Returns an object for which ``getattr(dt, 'fold', 0)`` returns 
+            ``fold`` for all versions of Python. In versions prior to 
+            Python 3.6, this is a ``_DatetimeWithFold`` object, which is a 
+            subclass of :py:class:`datetime.datetime` with the ``fold`` 
+            attribute added, if ``fold`` is 1. 
+ 
+        .. versionadded:: 2.6.0 
+        """ 
+        return dt.replace(fold=fold) 
+ 
+else: 
+    class _DatetimeWithFold(datetime): 
+        """ 
+        This is a class designed to provide a PEP 495-compliant interface for 
+        Python versions before 3.6. It is used only for dates in a fold, so 
+        the ``fold`` attribute is fixed at ``1``. 
+ 
+        .. versionadded:: 2.6.0 
+        """ 
+        __slots__ = () 
+ 
         def replace(self, *args, **kwargs):
             """
             Return a datetime with the same attributes, except for those
@@ -95,325 +95,325 @@ else:
 
             return dt_class(**kwargs)
 
-        @property
-        def fold(self):
-            return 1
-
-    def enfold(dt, fold=1):
-        """
-        Provides a unified interface for assigning the ``fold`` attribute to
-        datetimes both before and after the implementation of PEP-495.
-
-        :param fold:
-            The value for the ``fold`` attribute in the returned datetime. This
-            should be either 0 or 1.
-
-        :return:
-            Returns an object for which ``getattr(dt, 'fold', 0)`` returns
-            ``fold`` for all versions of Python. In versions prior to
-            Python 3.6, this is a ``_DatetimeWithFold`` object, which is a
-            subclass of :py:class:`datetime.datetime` with the ``fold``
-            attribute added, if ``fold`` is 1.
-
-        .. versionadded:: 2.6.0
-        """
-        if getattr(dt, 'fold', 0) == fold:
-            return dt
-
-        args = dt.timetuple()[:6]
-        args += (dt.microsecond, dt.tzinfo)
-
-        if fold:
-            return _DatetimeWithFold(*args)
-        else:
-            return datetime(*args)
-
-
-def _validate_fromutc_inputs(f):
-    """
-    The CPython version of ``fromutc`` checks that the input is a ``datetime``
-    object and that ``self`` is attached as its ``tzinfo``.
-    """
-    @wraps(f)
-    def fromutc(self, dt):
-        if not isinstance(dt, datetime):
-            raise TypeError("fromutc() requires a datetime argument")
-        if dt.tzinfo is not self:
-            raise ValueError("dt.tzinfo is not self")
-
-        return f(self, dt)
-
-    return fromutc
-
-
-class _tzinfo(tzinfo):
-    """
-    Base class for all ``dateutil`` ``tzinfo`` objects.
-    """
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-
-        dt = dt.replace(tzinfo=self)
-
-        wall_0 = enfold(dt, fold=0)
-        wall_1 = enfold(dt, fold=1)
-
-        same_offset = wall_0.utcoffset() == wall_1.utcoffset()
-        same_dt = wall_0.replace(tzinfo=None) == wall_1.replace(tzinfo=None)
-
-        return same_dt and not same_offset
-
-    def _fold_status(self, dt_utc, dt_wall):
-        """
-        Determine the fold status of a "wall" datetime, given a representation
-        of the same datetime as a (naive) UTC datetime. This is calculated based
-        on the assumption that ``dt.utcoffset() - dt.dst()`` is constant for all
-        datetimes, and that this offset is the actual number of hours separating
-        ``dt_utc`` and ``dt_wall``.
-
-        :param dt_utc:
-            Representation of the datetime as UTC
-
-        :param dt_wall:
-            Representation of the datetime as "wall time". This parameter must
-            either have a `fold` attribute or have a fold-naive
-            :class:`datetime.tzinfo` attached, otherwise the calculation may
-            fail.
-        """
-        if self.is_ambiguous(dt_wall):
-            delta_wall = dt_wall - dt_utc
-            _fold = int(delta_wall == (dt_utc.utcoffset() - dt_utc.dst()))
-        else:
-            _fold = 0
-
-        return _fold
-
-    def _fold(self, dt):
-        return getattr(dt, 'fold', 0)
-
-    def _fromutc(self, dt):
-        """
-        Given a timezone-aware datetime in a given timezone, calculates a
-        timezone-aware datetime in a new timezone.
-
-        Since this is the one time that we *know* we have an unambiguous
-        datetime object, we take this opportunity to determine whether the
-        datetime is ambiguous and in a "fold" state (e.g. if it's the first
+        @property 
+        def fold(self): 
+            return 1 
+ 
+    def enfold(dt, fold=1): 
+        """ 
+        Provides a unified interface for assigning the ``fold`` attribute to 
+        datetimes both before and after the implementation of PEP-495. 
+ 
+        :param fold: 
+            The value for the ``fold`` attribute in the returned datetime. This 
+            should be either 0 or 1. 
+ 
+        :return: 
+            Returns an object for which ``getattr(dt, 'fold', 0)`` returns 
+            ``fold`` for all versions of Python. In versions prior to 
+            Python 3.6, this is a ``_DatetimeWithFold`` object, which is a 
+            subclass of :py:class:`datetime.datetime` with the ``fold`` 
+            attribute added, if ``fold`` is 1. 
+ 
+        .. versionadded:: 2.6.0 
+        """ 
+        if getattr(dt, 'fold', 0) == fold: 
+            return dt 
+ 
+        args = dt.timetuple()[:6] 
+        args += (dt.microsecond, dt.tzinfo) 
+ 
+        if fold: 
+            return _DatetimeWithFold(*args) 
+        else: 
+            return datetime(*args) 
+ 
+ 
+def _validate_fromutc_inputs(f): 
+    """ 
+    The CPython version of ``fromutc`` checks that the input is a ``datetime`` 
+    object and that ``self`` is attached as its ``tzinfo``. 
+    """ 
+    @wraps(f) 
+    def fromutc(self, dt): 
+        if not isinstance(dt, datetime): 
+            raise TypeError("fromutc() requires a datetime argument") 
+        if dt.tzinfo is not self: 
+            raise ValueError("dt.tzinfo is not self") 
+ 
+        return f(self, dt) 
+ 
+    return fromutc 
+ 
+ 
+class _tzinfo(tzinfo): 
+    """ 
+    Base class for all ``dateutil`` ``tzinfo`` objects. 
+    """ 
+ 
+    def is_ambiguous(self, dt): 
+        """ 
+        Whether or not the "wall time" of a given datetime is ambiguous in this 
+        zone. 
+ 
+        :param dt: 
+            A :py:class:`datetime.datetime`, naive or time zone aware. 
+ 
+ 
+        :return: 
+            Returns ``True`` if ambiguous, ``False`` otherwise. 
+ 
+        .. versionadded:: 2.6.0 
+        """ 
+ 
+        dt = dt.replace(tzinfo=self) 
+ 
+        wall_0 = enfold(dt, fold=0) 
+        wall_1 = enfold(dt, fold=1) 
+ 
+        same_offset = wall_0.utcoffset() == wall_1.utcoffset() 
+        same_dt = wall_0.replace(tzinfo=None) == wall_1.replace(tzinfo=None) 
+ 
+        return same_dt and not same_offset 
+ 
+    def _fold_status(self, dt_utc, dt_wall): 
+        """ 
+        Determine the fold status of a "wall" datetime, given a representation 
+        of the same datetime as a (naive) UTC datetime. This is calculated based 
+        on the assumption that ``dt.utcoffset() - dt.dst()`` is constant for all 
+        datetimes, and that this offset is the actual number of hours separating 
+        ``dt_utc`` and ``dt_wall``. 
+ 
+        :param dt_utc: 
+            Representation of the datetime as UTC 
+ 
+        :param dt_wall: 
+            Representation of the datetime as "wall time". This parameter must 
+            either have a `fold` attribute or have a fold-naive 
+            :class:`datetime.tzinfo` attached, otherwise the calculation may 
+            fail. 
+        """ 
+        if self.is_ambiguous(dt_wall): 
+            delta_wall = dt_wall - dt_utc 
+            _fold = int(delta_wall == (dt_utc.utcoffset() - dt_utc.dst())) 
+        else: 
+            _fold = 0 
+ 
+        return _fold 
+ 
+    def _fold(self, dt): 
+        return getattr(dt, 'fold', 0) 
+ 
+    def _fromutc(self, dt): 
+        """ 
+        Given a timezone-aware datetime in a given timezone, calculates a 
+        timezone-aware datetime in a new timezone. 
+ 
+        Since this is the one time that we *know* we have an unambiguous 
+        datetime object, we take this opportunity to determine whether the 
+        datetime is ambiguous and in a "fold" state (e.g. if it's the first 
         occurrence, chronologically, of the ambiguous datetime).
-
-        :param dt:
-            A timezone-aware :class:`datetime.datetime` object.
-        """
-
-        # Re-implement the algorithm from Python's datetime.py
-        dtoff = dt.utcoffset()
-        if dtoff is None:
-            raise ValueError("fromutc() requires a non-None utcoffset() "
-                             "result")
-
-        # The original datetime.py code assumes that `dst()` defaults to
-        # zero during ambiguous times. PEP 495 inverts this presumption, so
-        # for pre-PEP 495 versions of python, we need to tweak the algorithm.
-        dtdst = dt.dst()
-        if dtdst is None:
-            raise ValueError("fromutc() requires a non-None dst() result")
-        delta = dtoff - dtdst
-
-        dt += delta
-        # Set fold=1 so we can default to being in the fold for
-        # ambiguous dates.
-        dtdst = enfold(dt, fold=1).dst()
-        if dtdst is None:
-            raise ValueError("fromutc(): dt.dst gave inconsistent "
-                             "results; cannot convert")
-        return dt + dtdst
-
-    @_validate_fromutc_inputs
-    def fromutc(self, dt):
-        """
-        Given a timezone-aware datetime in a given timezone, calculates a
-        timezone-aware datetime in a new timezone.
-
-        Since this is the one time that we *know* we have an unambiguous
-        datetime object, we take this opportunity to determine whether the
-        datetime is ambiguous and in a "fold" state (e.g. if it's the first
+ 
+        :param dt: 
+            A timezone-aware :class:`datetime.datetime` object. 
+        """ 
+ 
+        # Re-implement the algorithm from Python's datetime.py 
+        dtoff = dt.utcoffset() 
+        if dtoff is None: 
+            raise ValueError("fromutc() requires a non-None utcoffset() " 
+                             "result") 
+ 
+        # The original datetime.py code assumes that `dst()` defaults to 
+        # zero during ambiguous times. PEP 495 inverts this presumption, so 
+        # for pre-PEP 495 versions of python, we need to tweak the algorithm. 
+        dtdst = dt.dst() 
+        if dtdst is None: 
+            raise ValueError("fromutc() requires a non-None dst() result") 
+        delta = dtoff - dtdst 
+ 
+        dt += delta 
+        # Set fold=1 so we can default to being in the fold for 
+        # ambiguous dates. 
+        dtdst = enfold(dt, fold=1).dst() 
+        if dtdst is None: 
+            raise ValueError("fromutc(): dt.dst gave inconsistent " 
+                             "results; cannot convert") 
+        return dt + dtdst 
+ 
+    @_validate_fromutc_inputs 
+    def fromutc(self, dt): 
+        """ 
+        Given a timezone-aware datetime in a given timezone, calculates a 
+        timezone-aware datetime in a new timezone. 
+ 
+        Since this is the one time that we *know* we have an unambiguous 
+        datetime object, we take this opportunity to determine whether the 
+        datetime is ambiguous and in a "fold" state (e.g. if it's the first 
         occurrence, chronologically, of the ambiguous datetime).
-
-        :param dt:
-            A timezone-aware :class:`datetime.datetime` object.
-        """
-        dt_wall = self._fromutc(dt)
-
-        # Calculate the fold status given the two datetimes.
-        _fold = self._fold_status(dt, dt_wall)
-
-        # Set the default fold value for ambiguous dates
-        return enfold(dt_wall, fold=_fold)
-
-
-class tzrangebase(_tzinfo):
-    """
-    This is an abstract base class for time zones represented by an annual
-    transition into and out of DST. Child classes should implement the following
-    methods:
-
-        * ``__init__(self, *args, **kwargs)``
-        * ``transitions(self, year)`` - this is expected to return a tuple of
-          datetimes representing the DST on and off transitions in standard
-          time.
-
-    A fully initialized ``tzrangebase`` subclass should also provide the
-    following attributes:
-        * ``hasdst``: Boolean whether or not the zone uses DST.
-        * ``_dst_offset`` / ``_std_offset``: :class:`datetime.timedelta` objects
-          representing the respective UTC offsets.
-        * ``_dst_abbr`` / ``_std_abbr``: Strings representing the timezone short
-          abbreviations in DST and STD, respectively.
-        * ``_hasdst``: Whether or not the zone has DST.
-
-    .. versionadded:: 2.6.0
-    """
-    def __init__(self):
-        raise NotImplementedError('tzrangebase is an abstract base class')
-
-    def utcoffset(self, dt):
-        isdst = self._isdst(dt)
-
-        if isdst is None:
-            return None
-        elif isdst:
-            return self._dst_offset
-        else:
-            return self._std_offset
-
-    def dst(self, dt):
-        isdst = self._isdst(dt)
-
-        if isdst is None:
-            return None
-        elif isdst:
-            return self._dst_base_offset
-        else:
-            return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        if self._isdst(dt):
-            return self._dst_abbr
-        else:
-            return self._std_abbr
-
-    def fromutc(self, dt):
-        """ Given a datetime in UTC, return local time """
-        if not isinstance(dt, datetime):
-            raise TypeError("fromutc() requires a datetime argument")
-
-        if dt.tzinfo is not self:
-            raise ValueError("dt.tzinfo is not self")
-
-        # Get transitions - if there are none, fixed offset
-        transitions = self.transitions(dt.year)
-        if transitions is None:
-            return dt + self.utcoffset(dt)
-
-        # Get the transition times in UTC
-        dston, dstoff = transitions
-
-        dston -= self._std_offset
-        dstoff -= self._std_offset
-
-        utc_transitions = (dston, dstoff)
-        dt_utc = dt.replace(tzinfo=None)
-
-        isdst = self._naive_isdst(dt_utc, utc_transitions)
-
-        if isdst:
-            dt_wall = dt + self._dst_offset
-        else:
-            dt_wall = dt + self._std_offset
-
-        _fold = int(not isdst and self.is_ambiguous(dt_wall))
-
-        return enfold(dt_wall, fold=_fold)
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        if not self.hasdst:
-            return False
-
-        start, end = self.transitions(dt.year)
-
-        dt = dt.replace(tzinfo=None)
-        return (end <= dt < end + self._dst_base_offset)
-
-    def _isdst(self, dt):
-        if not self.hasdst:
-            return False
-        elif dt is None:
-            return None
-
-        transitions = self.transitions(dt.year)
-
-        if transitions is None:
-            return False
-
-        dt = dt.replace(tzinfo=None)
-
-        isdst = self._naive_isdst(dt, transitions)
-
-        # Handle ambiguous dates
-        if not isdst and self.is_ambiguous(dt):
-            return not self._fold(dt)
-        else:
-            return isdst
-
-    def _naive_isdst(self, dt, transitions):
-        dston, dstoff = transitions
-
-        dt = dt.replace(tzinfo=None)
-
-        if dston < dstoff:
-            isdst = dston <= dt < dstoff
-        else:
-            isdst = not dstoff <= dt < dston
-
-        return isdst
-
-    @property
-    def _dst_base_offset(self):
-        return self._dst_offset - self._std_offset
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s(...)" % self.__class__.__name__
-
-    __reduce__ = object.__reduce__
+ 
+        :param dt: 
+            A timezone-aware :class:`datetime.datetime` object. 
+        """ 
+        dt_wall = self._fromutc(dt) 
+ 
+        # Calculate the fold status given the two datetimes. 
+        _fold = self._fold_status(dt, dt_wall) 
+ 
+        # Set the default fold value for ambiguous dates 
+        return enfold(dt_wall, fold=_fold) 
+ 
+ 
+class tzrangebase(_tzinfo): 
+    """ 
+    This is an abstract base class for time zones represented by an annual 
+    transition into and out of DST. Child classes should implement the following 
+    methods: 
+ 
+        * ``__init__(self, *args, **kwargs)`` 
+        * ``transitions(self, year)`` - this is expected to return a tuple of 
+          datetimes representing the DST on and off transitions in standard 
+          time. 
+ 
+    A fully initialized ``tzrangebase`` subclass should also provide the 
+    following attributes: 
+        * ``hasdst``: Boolean whether or not the zone uses DST. 
+        * ``_dst_offset`` / ``_std_offset``: :class:`datetime.timedelta` objects 
+          representing the respective UTC offsets. 
+        * ``_dst_abbr`` / ``_std_abbr``: Strings representing the timezone short 
+          abbreviations in DST and STD, respectively. 
+        * ``_hasdst``: Whether or not the zone has DST. 
+ 
+    .. versionadded:: 2.6.0 
+    """ 
+    def __init__(self): 
+        raise NotImplementedError('tzrangebase is an abstract base class') 
+ 
+    def utcoffset(self, dt): 
+        isdst = self._isdst(dt) 
+ 
+        if isdst is None: 
+            return None 
+        elif isdst: 
+            return self._dst_offset 
+        else: 
+            return self._std_offset 
+ 
+    def dst(self, dt): 
+        isdst = self._isdst(dt) 
+ 
+        if isdst is None: 
+            return None 
+        elif isdst: 
+            return self._dst_base_offset 
+        else: 
+            return ZERO 
+ 
+    @tzname_in_python2 
+    def tzname(self, dt): 
+        if self._isdst(dt): 
+            return self._dst_abbr 
+        else: 
+            return self._std_abbr 
+ 
+    def fromutc(self, dt): 
+        """ Given a datetime in UTC, return local time """ 
+        if not isinstance(dt, datetime): 
+            raise TypeError("fromutc() requires a datetime argument") 
+ 
+        if dt.tzinfo is not self: 
+            raise ValueError("dt.tzinfo is not self") 
+ 
+        # Get transitions - if there are none, fixed offset 
+        transitions = self.transitions(dt.year) 
+        if transitions is None: 
+            return dt + self.utcoffset(dt) 
+ 
+        # Get the transition times in UTC 
+        dston, dstoff = transitions 
+ 
+        dston -= self._std_offset 
+        dstoff -= self._std_offset 
+ 
+        utc_transitions = (dston, dstoff) 
+        dt_utc = dt.replace(tzinfo=None) 
+ 
+        isdst = self._naive_isdst(dt_utc, utc_transitions) 
+ 
+        if isdst: 
+            dt_wall = dt + self._dst_offset 
+        else: 
+            dt_wall = dt + self._std_offset 
+ 
+        _fold = int(not isdst and self.is_ambiguous(dt_wall)) 
+ 
+        return enfold(dt_wall, fold=_fold) 
+ 
+    def is_ambiguous(self, dt): 
+        """ 
+        Whether or not the "wall time" of a given datetime is ambiguous in this 
+        zone. 
+ 
+        :param dt: 
+            A :py:class:`datetime.datetime`, naive or time zone aware. 
+ 
+ 
+        :return: 
+            Returns ``True`` if ambiguous, ``False`` otherwise. 
+ 
+        .. versionadded:: 2.6.0 
+        """ 
+        if not self.hasdst: 
+            return False 
+ 
+        start, end = self.transitions(dt.year) 
+ 
+        dt = dt.replace(tzinfo=None) 
+        return (end <= dt < end + self._dst_base_offset) 
+ 
+    def _isdst(self, dt): 
+        if not self.hasdst: 
+            return False 
+        elif dt is None: 
+            return None 
+ 
+        transitions = self.transitions(dt.year) 
+ 
+        if transitions is None: 
+            return False 
+ 
+        dt = dt.replace(tzinfo=None) 
+ 
+        isdst = self._naive_isdst(dt, transitions) 
+ 
+        # Handle ambiguous dates 
+        if not isdst and self.is_ambiguous(dt): 
+            return not self._fold(dt) 
+        else: 
+            return isdst 
+ 
+    def _naive_isdst(self, dt, transitions): 
+        dston, dstoff = transitions 
+ 
+        dt = dt.replace(tzinfo=None) 
+ 
+        if dston < dstoff: 
+            isdst = dston <= dt < dstoff 
+        else: 
+            isdst = not dstoff <= dt < dston 
+ 
+        return isdst 
+ 
+    @property 
+    def _dst_base_offset(self): 
+        return self._dst_offset - self._std_offset 
+ 
+    __hash__ = None 
+ 
+    def __ne__(self, other): 
+        return not (self == other) 
+ 
+    def __repr__(self): 
+        return "%s(...)" % self.__class__.__name__ 
+ 
+    __reduce__ = object.__reduce__ 
diff --git a/contrib/python/dateutil/dateutil/tz/tz.py b/contrib/python/dateutil/dateutil/tz/tz.py
index c67f56d465..638e624f7b 100644
--- a/contrib/python/dateutil/dateutil/tz/tz.py
+++ b/contrib/python/dateutil/dateutil/tz/tz.py
@@ -1,47 +1,47 @@
-# -*- coding: utf-8 -*-
-"""
-This module offers timezone implementations subclassing the abstract
+# -*- coding: utf-8 -*- 
+""" 
+This module offers timezone implementations subclassing the abstract 
 :py:class:`datetime.tzinfo` type. There are classes to handle tzfile format
 files (usually are in :file:`/etc/localtime`, :file:`/usr/share/zoneinfo`,
 etc), TZ environment string (in all known formats), given ranges (with help
 from relative deltas), local machine timezone, fixed offset timezone, and UTC
-timezone.
-"""
-import datetime
-import struct
-import time
-import sys
-import os
-import bisect
+timezone. 
+""" 
+import datetime 
+import struct 
+import time 
+import sys 
+import os 
+import bisect 
 import weakref
 from collections import OrderedDict
-
+ 
 import six
-from six import string_types
+from six import string_types 
 from six.moves import _thread
 from ._common import tzname_in_python2, _tzinfo
-from ._common import tzrangebase, enfold
-from ._common import _validate_fromutc_inputs
-
+from ._common import tzrangebase, enfold 
+from ._common import _validate_fromutc_inputs 
+ 
 from ._factories import _TzSingleton, _TzOffsetFactory
 from ._factories import _TzStrFactory
-try:
-    from .win import tzwin, tzwinlocal
-except ImportError:
-    tzwin = tzwinlocal = None
-
+try: 
+    from .win import tzwin, tzwinlocal 
+except ImportError: 
+    tzwin = tzwinlocal = None 
+ 
 # For warning about rounding tzinfo
 from warnings import warn
 
-ZERO = datetime.timedelta(0)
-EPOCH = datetime.datetime.utcfromtimestamp(0)
-EPOCHORDINAL = EPOCH.toordinal()
-
-
+ZERO = datetime.timedelta(0) 
+EPOCH = datetime.datetime.utcfromtimestamp(0) 
+EPOCHORDINAL = EPOCH.toordinal() 
+ 
+ 
 @six.add_metaclass(_TzSingleton)
-class tzutc(datetime.tzinfo):
-    """
-    This is a tzinfo object that represents the UTC time zone.
+class tzutc(datetime.tzinfo): 
+    """ 
+    This is a tzinfo object that represents the UTC time zone. 
 
     **Examples:**
 
@@ -70,59 +70,59 @@ class tzutc(datetime.tzinfo):
             True
             >>> tzutc() is UTC
             True
-    """
-    def utcoffset(self, dt):
-        return ZERO
-
-    def dst(self, dt):
-        return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        return "UTC"
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        return False
-
-    @_validate_fromutc_inputs
-    def fromutc(self, dt):
-        """
-        Fast track version of fromutc() returns the original ``dt`` object for
-        any valid :py:class:`datetime.datetime` object.
-        """
-        return dt
-
-    def __eq__(self, other):
-        if not isinstance(other, (tzutc, tzoffset)):
-            return NotImplemented
-
-        return (isinstance(other, tzutc) or
-                (isinstance(other, tzoffset) and other._offset == ZERO))
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s()" % self.__class__.__name__
-
-    __reduce__ = object.__reduce__
-
-
+    """ 
+    def utcoffset(self, dt): 
+        return ZERO 
+ 
+    def dst(self, dt): 
+        return ZERO 
+ 
+    @tzname_in_python2 
+    def tzname(self, dt): 
+        return "UTC" 
+ 
+    def is_ambiguous(self, dt): 
+        """ 
+        Whether or not the "wall time" of a given datetime is ambiguous in this 
+        zone. 
+ 
+        :param dt: 
+            A :py:class:`datetime.datetime`, naive or time zone aware. 
+ 
+ 
+        :return: 
+            Returns ``True`` if ambiguous, ``False`` otherwise. 
+ 
+        .. versionadded:: 2.6.0 
+        """ 
+        return False 
+ 
+    @_validate_fromutc_inputs 
+    def fromutc(self, dt): 
+        """ 
+        Fast track version of fromutc() returns the original ``dt`` object for 
+        any valid :py:class:`datetime.datetime` object. 
+        """ 
+        return dt 
+ 
+    def __eq__(self, other): 
+        if not isinstance(other, (tzutc, tzoffset)): 
+            return NotImplemented 
+ 
+        return (isinstance(other, tzutc) or 
+                (isinstance(other, tzoffset) and other._offset == ZERO)) 
+ 
+    __hash__ = None 
+ 
+    def __ne__(self, other): 
+        return not (self == other) 
+ 
+    def __repr__(self): 
+        return "%s()" % self.__class__.__name__ 
+ 
+    __reduce__ = object.__reduce__ 
+ 
+ 
 #: Convenience constant providing a :class:`tzutc()` instance
 #:
 #: .. versionadded:: 2.7.0
@@ -130,176 +130,176 @@ UTC = tzutc()
 
 
 @six.add_metaclass(_TzOffsetFactory)
-class tzoffset(datetime.tzinfo):
-    """
-    A simple class for representing a fixed offset from UTC.
-
-    :param name:
-        The timezone name, to be returned when ``tzname()`` is called.
-    :param offset:
-        The time zone offset in seconds, or (since version 2.6.0, represented
+class tzoffset(datetime.tzinfo): 
+    """ 
+    A simple class for representing a fixed offset from UTC. 
+ 
+    :param name: 
+        The timezone name, to be returned when ``tzname()`` is called. 
+    :param offset: 
+        The time zone offset in seconds, or (since version 2.6.0, represented 
         as a :py:class:`datetime.timedelta` object).
-    """
-    def __init__(self, name, offset):
-        self._name = name
-
-        try:
-            # Allow a timedelta
+    """ 
+    def __init__(self, name, offset): 
+        self._name = name 
+ 
+        try: 
+            # Allow a timedelta 
             offset = offset.total_seconds()
-        except (TypeError, AttributeError):
-            pass
-
+        except (TypeError, AttributeError): 
+            pass 
+ 
         self._offset = datetime.timedelta(seconds=_get_supported_offset(offset))
 
-    def utcoffset(self, dt):
-        return self._offset
-
-    def dst(self, dt):
-        return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        return self._name
-
-    @_validate_fromutc_inputs
-    def fromutc(self, dt):
-        return dt + self._offset
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        return False
-
-    def __eq__(self, other):
-        if not isinstance(other, tzoffset):
-            return NotImplemented
-
-        return self._offset == other._offset
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s(%s, %s)" % (self.__class__.__name__,
-                               repr(self._name),
+    def utcoffset(self, dt): 
+        return self._offset 
+ 
+    def dst(self, dt): 
+        return ZERO 
+ 
+    @tzname_in_python2 
+    def tzname(self, dt): 
+        return self._name 
+ 
+    @_validate_fromutc_inputs 
+    def fromutc(self, dt): 
+        return dt + self._offset 
+ 
+    def is_ambiguous(self, dt): 
+        """ 
+        Whether or not the "wall time" of a given datetime is ambiguous in this 
+        zone. 
+ 
+        :param dt: 
+            A :py:class:`datetime.datetime`, naive or time zone aware. 
+        :return: 
+            Returns ``True`` if ambiguous, ``False`` otherwise. 
+ 
+        .. versionadded:: 2.6.0 
+        """ 
+        return False 
+ 
+    def __eq__(self, other): 
+        if not isinstance(other, tzoffset): 
+            return NotImplemented 
+ 
+        return self._offset == other._offset 
+ 
+    __hash__ = None 
+ 
+    def __ne__(self, other): 
+        return not (self == other) 
+ 
+    def __repr__(self): 
+        return "%s(%s, %s)" % (self.__class__.__name__, 
+                               repr(self._name), 
                                int(self._offset.total_seconds()))
-
-    __reduce__ = object.__reduce__
-
-
-class tzlocal(_tzinfo):
-    """
-    A :class:`tzinfo` subclass built around the ``time`` timezone functions.
-    """
-    def __init__(self):
-        super(tzlocal, self).__init__()
-
-        self._std_offset = datetime.timedelta(seconds=-time.timezone)
-        if time.daylight:
-            self._dst_offset = datetime.timedelta(seconds=-time.altzone)
-        else:
-            self._dst_offset = self._std_offset
-
-        self._dst_saved = self._dst_offset - self._std_offset
-        self._hasdst = bool(self._dst_saved)
+ 
+    __reduce__ = object.__reduce__ 
+ 
+ 
+class tzlocal(_tzinfo): 
+    """ 
+    A :class:`tzinfo` subclass built around the ``time`` timezone functions. 
+    """ 
+    def __init__(self): 
+        super(tzlocal, self).__init__() 
+ 
+        self._std_offset = datetime.timedelta(seconds=-time.timezone) 
+        if time.daylight: 
+            self._dst_offset = datetime.timedelta(seconds=-time.altzone) 
+        else: 
+            self._dst_offset = self._std_offset 
+ 
+        self._dst_saved = self._dst_offset - self._std_offset 
+        self._hasdst = bool(self._dst_saved) 
         self._tznames = tuple(time.tzname)
-
-    def utcoffset(self, dt):
-        if dt is None and self._hasdst:
-            return None
-
-        if self._isdst(dt):
-            return self._dst_offset
-        else:
-            return self._std_offset
-
-    def dst(self, dt):
-        if dt is None and self._hasdst:
-            return None
-
-        if self._isdst(dt):
-            return self._dst_offset - self._std_offset
-        else:
-            return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
+ 
+    def utcoffset(self, dt): 
+        if dt is None and self._hasdst: 
+            return None 
+ 
+        if self._isdst(dt): 
+            return self._dst_offset 
+        else: 
+            return self._std_offset 
+ 
+    def dst(self, dt): 
+        if dt is None and self._hasdst: 
+            return None 
+ 
+        if self._isdst(dt): 
+            return self._dst_offset - self._std_offset 
+        else: 
+            return ZERO 
+ 
+    @tzname_in_python2 
+    def tzname(self, dt): 
         return self._tznames[self._isdst(dt)]
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        naive_dst = self._naive_is_dst(dt)
-        return (not naive_dst and
-                (naive_dst != self._naive_is_dst(dt - self._dst_saved)))
-
-    def _naive_is_dst(self, dt):
-        timestamp = _datetime_to_timestamp(dt)
-        return time.localtime(timestamp + time.timezone).tm_isdst
-
-    def _isdst(self, dt, fold_naive=True):
-        # We can't use mktime here. It is unstable when deciding if
-        # the hour near to a change is DST or not.
-        #
-        # timestamp = time.mktime((dt.year, dt.month, dt.day, dt.hour,
-        #                         dt.minute, dt.second, dt.weekday(), 0, -1))
-        # return time.localtime(timestamp).tm_isdst
-        #
-        # The code above yields the following result:
-        #
-        # >>> import tz, datetime
-        # >>> t = tz.tzlocal()
-        # >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
-        # 'BRDT'
-        # >>> datetime.datetime(2003,2,16,0,tzinfo=t).tzname()
-        # 'BRST'
-        # >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
-        # 'BRST'
-        # >>> datetime.datetime(2003,2,15,22,tzinfo=t).tzname()
-        # 'BRDT'
-        # >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
-        # 'BRDT'
-        #
-        # Here is a more stable implementation:
-        #
-        if not self._hasdst:
-            return False
-
-        # Check for ambiguous times:
-        dstval = self._naive_is_dst(dt)
-        fold = getattr(dt, 'fold', None)
-
-        if self.is_ambiguous(dt):
-            if fold is not None:
-                return not self._fold(dt)
-            else:
-                return True
-
-        return dstval
-
-    def __eq__(self, other):
+ 
+    def is_ambiguous(self, dt): 
+        """ 
+        Whether or not the "wall time" of a given datetime is ambiguous in this 
+        zone. 
+ 
+        :param dt: 
+            A :py:class:`datetime.datetime`, naive or time zone aware. 
+ 
+ 
+        :return: 
+            Returns ``True`` if ambiguous, ``False`` otherwise. 
+ 
+        .. versionadded:: 2.6.0 
+        """ 
+        naive_dst = self._naive_is_dst(dt) 
+        return (not naive_dst and 
+                (naive_dst != self._naive_is_dst(dt - self._dst_saved))) 
+ 
+    def _naive_is_dst(self, dt): 
+        timestamp = _datetime_to_timestamp(dt) 
+        return time.localtime(timestamp + time.timezone).tm_isdst 
+ 
+    def _isdst(self, dt, fold_naive=True): 
+        # We can't use mktime here. It is unstable when deciding if 
+        # the hour near to a change is DST or not. 
+        # 
+        # timestamp = time.mktime((dt.year, dt.month, dt.day, dt.hour, 
+        #                         dt.minute, dt.second, dt.weekday(), 0, -1)) 
+        # return time.localtime(timestamp).tm_isdst 
+        # 
+        # The code above yields the following result: 
+        # 
+        # >>> import tz, datetime 
+        # >>> t = tz.tzlocal() 
+        # >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname() 
+        # 'BRDT' 
+        # >>> datetime.datetime(2003,2,16,0,tzinfo=t).tzname() 
+        # 'BRST' 
+        # >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname() 
+        # 'BRST' 
+        # >>> datetime.datetime(2003,2,15,22,tzinfo=t).tzname() 
+        # 'BRDT' 
+        # >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname() 
+        # 'BRDT' 
+        # 
+        # Here is a more stable implementation: 
+        # 
+        if not self._hasdst: 
+            return False 
+ 
+        # Check for ambiguous times: 
+        dstval = self._naive_is_dst(dt) 
+        fold = getattr(dt, 'fold', None) 
+ 
+        if self.is_ambiguous(dt): 
+            if fold is not None: 
+                return not self._fold(dt) 
+            else: 
+                return True 
+ 
+        return dstval 
+ 
+    def __eq__(self, other): 
         if isinstance(other, tzlocal):
             return (self._std_offset == other._std_offset and
                     self._dst_offset == other._dst_offset)
@@ -312,97 +312,97 @@ class tzlocal(_tzinfo):
                     self._tznames[0] == other._name and
                     self._std_offset == other._offset)
         else:
-            return NotImplemented
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s()" % self.__class__.__name__
-
-    __reduce__ = object.__reduce__
-
-
-class _ttinfo(object):
-    __slots__ = ["offset", "delta", "isdst", "abbr",
-                 "isstd", "isgmt", "dstoffset"]
-
-    def __init__(self):
-        for attr in self.__slots__:
-            setattr(self, attr, None)
-
-    def __repr__(self):
-        l = []
-        for attr in self.__slots__:
-            value = getattr(self, attr)
-            if value is not None:
-                l.append("%s=%s" % (attr, repr(value)))
-        return "%s(%s)" % (self.__class__.__name__, ", ".join(l))
-
-    def __eq__(self, other):
-        if not isinstance(other, _ttinfo):
-            return NotImplemented
-
-        return (self.offset == other.offset and
-                self.delta == other.delta and
-                self.isdst == other.isdst and
-                self.abbr == other.abbr and
-                self.isstd == other.isstd and
-                self.isgmt == other.isgmt and
-                self.dstoffset == other.dstoffset)
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __getstate__(self):
-        state = {}
-        for name in self.__slots__:
-            state[name] = getattr(self, name, None)
-        return state
-
-    def __setstate__(self, state):
-        for name in self.__slots__:
-            if name in state:
-                setattr(self, name, state[name])
-
-
-class _tzfile(object):
-    """
-    Lightweight class for holding the relevant transition and time zone
-    information read from binary tzfiles.
-    """
-    attrs = ['trans_list', 'trans_list_utc', 'trans_idx', 'ttinfo_list',
-             'ttinfo_std', 'ttinfo_dst', 'ttinfo_before', 'ttinfo_first']
-
-    def __init__(self, **kwargs):
-        for attr in self.attrs:
-            setattr(self, attr, kwargs.get(attr, None))
-
-
-class tzfile(_tzinfo):
-    """
+            return NotImplemented 
+ 
+    __hash__ = None 
+ 
+    def __ne__(self, other): 
+        return not (self == other) 
+ 
+    def __repr__(self): 
+        return "%s()" % self.__class__.__name__ 
+ 
+    __reduce__ = object.__reduce__ 
+ 
+ 
+class _ttinfo(object): 
+    __slots__ = ["offset", "delta", "isdst", "abbr", 
+                 "isstd", "isgmt", "dstoffset"] 
+ 
+    def __init__(self): 
+        for attr in self.__slots__: 
+            setattr(self, attr, None) 
+ 
+    def __repr__(self): 
+        l = [] 
+        for attr in self.__slots__: 
+            value = getattr(self, attr) 
+            if value is not None: 
+                l.append("%s=%s" % (attr, repr(value))) 
+        return "%s(%s)" % (self.__class__.__name__, ", ".join(l)) 
+ 
+    def __eq__(self, other): 
+        if not isinstance(other, _ttinfo): 
+            return NotImplemented 
+ 
+        return (self.offset == other.offset and 
+                self.delta == other.delta and 
+                self.isdst == other.isdst and 
+                self.abbr == other.abbr and 
+                self.isstd == other.isstd and 
+                self.isgmt == other.isgmt and 
+                self.dstoffset == other.dstoffset) 
+ 
+    __hash__ = None 
+ 
+    def __ne__(self, other): 
+        return not (self == other) 
+ 
+    def __getstate__(self): 
+        state = {} 
+        for name in self.__slots__: 
+            state[name] = getattr(self, name, None) 
+        return state 
+ 
+    def __setstate__(self, state): 
+        for name in self.__slots__: 
+            if name in state: 
+                setattr(self, name, state[name]) 
+ 
+ 
+class _tzfile(object): 
+    """ 
+    Lightweight class for holding the relevant transition and time zone 
+    information read from binary tzfiles. 
+    """ 
+    attrs = ['trans_list', 'trans_list_utc', 'trans_idx', 'ttinfo_list', 
+             'ttinfo_std', 'ttinfo_dst', 'ttinfo_before', 'ttinfo_first'] 
+ 
+    def __init__(self, **kwargs): 
+        for attr in self.attrs: 
+            setattr(self, attr, kwargs.get(attr, None)) 
+ 
+ 
+class tzfile(_tzinfo): 
+    """ 
     This is a ``tzinfo`` subclass that allows one to use the ``tzfile(5)``
-    format timezone files to extract current and historical zone information.
-
-    :param fileobj:
-        This can be an opened file stream or a file name that the time zone
-        information can be read from.
-
-    :param filename:
-        This is an optional parameter specifying the source of the time zone
-        information in the event that ``fileobj`` is a file object. If omitted
-        and ``fileobj`` is a file stream, this parameter will be set either to
-        ``fileobj``'s ``name`` attribute or to ``repr(fileobj)``.
-
-    See `Sources for Time Zone and Daylight Saving Time Data
+    format timezone files to extract current and historical zone information. 
+ 
+    :param fileobj: 
+        This can be an opened file stream or a file name that the time zone 
+        information can be read from. 
+ 
+    :param filename: 
+        This is an optional parameter specifying the source of the time zone 
+        information in the event that ``fileobj`` is a file object. If omitted 
+        and ``fileobj`` is a file stream, this parameter will be set either to 
+        ``fileobj``'s ``name`` attribute or to ``repr(fileobj)``. 
+ 
+    See `Sources for Time Zone and Daylight Saving Time Data 
     <https://data.iana.org/time-zones/tz-link.html>`_ for more information.
     Time zone files can be compiled from the `IANA Time Zone database files
-    <https://www.iana.org/time-zones>`_ with the `zic time zone compiler
-    <https://www.freebsd.org/cgi/man.cgi?query=zic&sektion=8>`_
+    <https://www.iana.org/time-zones>`_ with the `zic time zone compiler 
+    <https://www.freebsd.org/cgi/man.cgi?query=zic&sektion=8>`_ 
 
     .. note::
 
@@ -453,238 +453,238 @@ class tzfile(_tzinfo):
         >>> print(datetime(1944, 2, 7, tzinfo=NYC))    # EWT
         1944-02-07 00:00:00-04:00
 
-    """
-
-    def __init__(self, fileobj, filename=None):
-        super(tzfile, self).__init__()
-
-        file_opened_here = False
-        if isinstance(fileobj, string_types):
-            self._filename = fileobj
-            fileobj = open(fileobj, 'rb')
-            file_opened_here = True
-        elif filename is not None:
-            self._filename = filename
-        elif hasattr(fileobj, "name"):
-            self._filename = fileobj.name
-        else:
-            self._filename = repr(fileobj)
-
-        if fileobj is not None:
-            if not file_opened_here:
+    """ 
+ 
+    def __init__(self, fileobj, filename=None): 
+        super(tzfile, self).__init__() 
+ 
+        file_opened_here = False 
+        if isinstance(fileobj, string_types): 
+            self._filename = fileobj 
+            fileobj = open(fileobj, 'rb') 
+            file_opened_here = True 
+        elif filename is not None: 
+            self._filename = filename 
+        elif hasattr(fileobj, "name"): 
+            self._filename = fileobj.name 
+        else: 
+            self._filename = repr(fileobj) 
+ 
+        if fileobj is not None: 
+            if not file_opened_here: 
                 fileobj = _nullcontext(fileobj)
-
-            with fileobj as file_stream:
-                tzobj = self._read_tzfile(file_stream)
-
-            self._set_tzdata(tzobj)
-
-    def _set_tzdata(self, tzobj):
-        """ Set the time zone data of this object from a _tzfile object """
-        # Copy the relevant attributes over as private attributes
-        for attr in _tzfile.attrs:
-            setattr(self, '_' + attr, getattr(tzobj, attr))
-
-    def _read_tzfile(self, fileobj):
-        out = _tzfile()
-
-        # From tzfile(5):
-        #
-        # The time zone information files used by tzset(3)
-        # begin with the magic characters "TZif" to identify
-        # them as time zone information files, followed by
-        # sixteen bytes reserved for future use, followed by
-        # six four-byte values of type long, written in a
-        # ``standard'' byte order (the high-order  byte
-        # of the value is written first).
-        if fileobj.read(4).decode() != "TZif":
-            raise ValueError("magic not found")
-
-        fileobj.read(16)
-
-        (
-            # The number of UTC/local indicators stored in the file.
-            ttisgmtcnt,
-
-            # The number of standard/wall indicators stored in the file.
-            ttisstdcnt,
-
-            # The number of leap seconds for which data is
-            # stored in the file.
-            leapcnt,
-
-            # The number of "transition times" for which data
-            # is stored in the file.
-            timecnt,
-
-            # The number of "local time types" for which data
-            # is stored in the file (must not be zero).
-            typecnt,
-
-            # The  number  of  characters  of "time zone
-            # abbreviation strings" stored in the file.
-            charcnt,
-
-        ) = struct.unpack(">6l", fileobj.read(24))
-
-        # The above header is followed by tzh_timecnt four-byte
-        # values  of  type long,  sorted  in ascending order.
-        # These values are written in ``standard'' byte order.
-        # Each is used as a transition time (as  returned  by
-        # time(2)) at which the rules for computing local time
-        # change.
-
-        if timecnt:
-            out.trans_list_utc = list(struct.unpack(">%dl" % timecnt,
-                                                    fileobj.read(timecnt*4)))
-        else:
-            out.trans_list_utc = []
-
-        # Next come tzh_timecnt one-byte values of type unsigned
-        # char; each one tells which of the different types of
-        # ``local time'' types described in the file is associated
-        # with the same-indexed transition time. These values
-        # serve as indices into an array of ttinfo structures that
-        # appears next in the file.
-
-        if timecnt:
-            out.trans_idx = struct.unpack(">%dB" % timecnt,
+ 
+            with fileobj as file_stream: 
+                tzobj = self._read_tzfile(file_stream) 
+ 
+            self._set_tzdata(tzobj) 
+ 
+    def _set_tzdata(self, tzobj): 
+        """ Set the time zone data of this object from a _tzfile object """ 
+        # Copy the relevant attributes over as private attributes 
+        for attr in _tzfile.attrs: 
+            setattr(self, '_' + attr, getattr(tzobj, attr)) 
+ 
+    def _read_tzfile(self, fileobj): 
+        out = _tzfile() 
+ 
+        # From tzfile(5): 
+        # 
+        # The time zone information files used by tzset(3) 
+        # begin with the magic characters "TZif" to identify 
+        # them as time zone information files, followed by 
+        # sixteen bytes reserved for future use, followed by 
+        # six four-byte values of type long, written in a 
+        # ``standard'' byte order (the high-order  byte 
+        # of the value is written first). 
+        if fileobj.read(4).decode() != "TZif": 
+            raise ValueError("magic not found") 
+ 
+        fileobj.read(16) 
+ 
+        ( 
+            # The number of UTC/local indicators stored in the file. 
+            ttisgmtcnt, 
+ 
+            # The number of standard/wall indicators stored in the file. 
+            ttisstdcnt, 
+ 
+            # The number of leap seconds for which data is 
+            # stored in the file. 
+            leapcnt, 
+ 
+            # The number of "transition times" for which data 
+            # is stored in the file. 
+            timecnt, 
+ 
+            # The number of "local time types" for which data 
+            # is stored in the file (must not be zero). 
+            typecnt, 
+ 
+            # The  number  of  characters  of "time zone 
+            # abbreviation strings" stored in the file. 
+            charcnt, 
+ 
+        ) = struct.unpack(">6l", fileobj.read(24)) 
+ 
+        # The above header is followed by tzh_timecnt four-byte 
+        # values  of  type long,  sorted  in ascending order. 
+        # These values are written in ``standard'' byte order. 
+        # Each is used as a transition time (as  returned  by 
+        # time(2)) at which the rules for computing local time 
+        # change. 
+ 
+        if timecnt: 
+            out.trans_list_utc = list(struct.unpack(">%dl" % timecnt, 
+                                                    fileobj.read(timecnt*4))) 
+        else: 
+            out.trans_list_utc = [] 
+ 
+        # Next come tzh_timecnt one-byte values of type unsigned 
+        # char; each one tells which of the different types of 
+        # ``local time'' types described in the file is associated 
+        # with the same-indexed transition time. These values 
+        # serve as indices into an array of ttinfo structures that 
+        # appears next in the file. 
+ 
+        if timecnt: 
+            out.trans_idx = struct.unpack(">%dB" % timecnt, 
                                           fileobj.read(timecnt))
-        else:
-            out.trans_idx = []
-
-        # Each ttinfo structure is written as a four-byte value
-        # for tt_gmtoff  of  type long,  in  a  standard  byte
-        # order, followed  by a one-byte value for tt_isdst
-        # and a one-byte  value  for  tt_abbrind.   In  each
-        # structure, tt_gmtoff  gives  the  number  of
-        # seconds to be added to UTC, tt_isdst tells whether
-        # tm_isdst should be set by  localtime(3),  and
-        # tt_abbrind serves  as an index into the array of
-        # time zone abbreviation characters that follow the
-        # ttinfo structure(s) in the file.
-
-        ttinfo = []
-
-        for i in range(typecnt):
-            ttinfo.append(struct.unpack(">lbb", fileobj.read(6)))
-
-        abbr = fileobj.read(charcnt).decode()
-
-        # Then there are tzh_leapcnt pairs of four-byte
-        # values, written in  standard byte  order;  the
-        # first  value  of  each pair gives the time (as
-        # returned by time(2)) at which a leap second
-        # occurs;  the  second  gives the  total  number of
-        # leap seconds to be applied after the given time.
-        # The pairs of values are sorted in ascending order
-        # by time.
-
-        # Not used, for now (but seek for correct file position)
-        if leapcnt:
-            fileobj.seek(leapcnt * 8, os.SEEK_CUR)
-
-        # Then there are tzh_ttisstdcnt standard/wall
-        # indicators, each stored as a one-byte value;
-        # they tell whether the transition times associated
-        # with local time types were specified as standard
-        # time or wall clock time, and are used when
-        # a time zone file is used in handling POSIX-style
-        # time zone environment variables.
-
-        if ttisstdcnt:
-            isstd = struct.unpack(">%db" % ttisstdcnt,
-                                  fileobj.read(ttisstdcnt))
-
-        # Finally, there are tzh_ttisgmtcnt UTC/local
-        # indicators, each stored as a one-byte value;
-        # they tell whether the transition times associated
-        # with local time types were specified as UTC or
-        # local time, and are used when a time zone file
-        # is used in handling POSIX-style time zone envi-
-        # ronment variables.
-
-        if ttisgmtcnt:
-            isgmt = struct.unpack(">%db" % ttisgmtcnt,
-                                  fileobj.read(ttisgmtcnt))
-
-        # Build ttinfo list
-        out.ttinfo_list = []
-        for i in range(typecnt):
-            gmtoff, isdst, abbrind = ttinfo[i]
+        else: 
+            out.trans_idx = [] 
+ 
+        # Each ttinfo structure is written as a four-byte value 
+        # for tt_gmtoff  of  type long,  in  a  standard  byte 
+        # order, followed  by a one-byte value for tt_isdst 
+        # and a one-byte  value  for  tt_abbrind.   In  each 
+        # structure, tt_gmtoff  gives  the  number  of 
+        # seconds to be added to UTC, tt_isdst tells whether 
+        # tm_isdst should be set by  localtime(3),  and 
+        # tt_abbrind serves  as an index into the array of 
+        # time zone abbreviation characters that follow the 
+        # ttinfo structure(s) in the file. 
+ 
+        ttinfo = [] 
+ 
+        for i in range(typecnt): 
+            ttinfo.append(struct.unpack(">lbb", fileobj.read(6))) 
+ 
+        abbr = fileobj.read(charcnt).decode() 
+ 
+        # Then there are tzh_leapcnt pairs of four-byte 
+        # values, written in  standard byte  order;  the 
+        # first  value  of  each pair gives the time (as 
+        # returned by time(2)) at which a leap second 
+        # occurs;  the  second  gives the  total  number of 
+        # leap seconds to be applied after the given time. 
+        # The pairs of values are sorted in ascending order 
+        # by time. 
+ 
+        # Not used, for now (but seek for correct file position) 
+        if leapcnt: 
+            fileobj.seek(leapcnt * 8, os.SEEK_CUR) 
+ 
+        # Then there are tzh_ttisstdcnt standard/wall 
+        # indicators, each stored as a one-byte value; 
+        # they tell whether the transition times associated 
+        # with local time types were specified as standard 
+        # time or wall clock time, and are used when 
+        # a time zone file is used in handling POSIX-style 
+        # time zone environment variables. 
+ 
+        if ttisstdcnt: 
+            isstd = struct.unpack(">%db" % ttisstdcnt, 
+                                  fileobj.read(ttisstdcnt)) 
+ 
+        # Finally, there are tzh_ttisgmtcnt UTC/local 
+        # indicators, each stored as a one-byte value; 
+        # they tell whether the transition times associated 
+        # with local time types were specified as UTC or 
+        # local time, and are used when a time zone file 
+        # is used in handling POSIX-style time zone envi- 
+        # ronment variables. 
+ 
+        if ttisgmtcnt: 
+            isgmt = struct.unpack(">%db" % ttisgmtcnt, 
+                                  fileobj.read(ttisgmtcnt)) 
+ 
+        # Build ttinfo list 
+        out.ttinfo_list = [] 
+        for i in range(typecnt): 
+            gmtoff, isdst, abbrind = ttinfo[i] 
             gmtoff = _get_supported_offset(gmtoff)
-            tti = _ttinfo()
-            tti.offset = gmtoff
-            tti.dstoffset = datetime.timedelta(0)
-            tti.delta = datetime.timedelta(seconds=gmtoff)
-            tti.isdst = isdst
-            tti.abbr = abbr[abbrind:abbr.find('\x00', abbrind)]
-            tti.isstd = (ttisstdcnt > i and isstd[i] != 0)
-            tti.isgmt = (ttisgmtcnt > i and isgmt[i] != 0)
-            out.ttinfo_list.append(tti)
-
-        # Replace ttinfo indexes for ttinfo objects.
-        out.trans_idx = [out.ttinfo_list[idx] for idx in out.trans_idx]
-
-        # Set standard, dst, and before ttinfos. before will be
-        # used when a given time is before any transitions,
-        # and will be set to the first non-dst ttinfo, or to
-        # the first dst, if all of them are dst.
-        out.ttinfo_std = None
-        out.ttinfo_dst = None
-        out.ttinfo_before = None
-        if out.ttinfo_list:
-            if not out.trans_list_utc:
-                out.ttinfo_std = out.ttinfo_first = out.ttinfo_list[0]
-            else:
-                for i in range(timecnt-1, -1, -1):
-                    tti = out.trans_idx[i]
-                    if not out.ttinfo_std and not tti.isdst:
-                        out.ttinfo_std = tti
-                    elif not out.ttinfo_dst and tti.isdst:
-                        out.ttinfo_dst = tti
-
-                    if out.ttinfo_std and out.ttinfo_dst:
-                        break
-                else:
-                    if out.ttinfo_dst and not out.ttinfo_std:
-                        out.ttinfo_std = out.ttinfo_dst
-
-                for tti in out.ttinfo_list:
-                    if not tti.isdst:
-                        out.ttinfo_before = tti
-                        break
-                else:
-                    out.ttinfo_before = out.ttinfo_list[0]
-
-        # Now fix transition times to become relative to wall time.
-        #
-        # I'm not sure about this. In my tests, the tz source file
-        # is setup to wall time, and in the binary file isstd and
-        # isgmt are off, so it should be in wall time. OTOH, it's
-        # always in gmt time. Let me know if you have comments
-        # about this.
+            tti = _ttinfo() 
+            tti.offset = gmtoff 
+            tti.dstoffset = datetime.timedelta(0) 
+            tti.delta = datetime.timedelta(seconds=gmtoff) 
+            tti.isdst = isdst 
+            tti.abbr = abbr[abbrind:abbr.find('\x00', abbrind)] 
+            tti.isstd = (ttisstdcnt > i and isstd[i] != 0) 
+            tti.isgmt = (ttisgmtcnt > i and isgmt[i] != 0) 
+            out.ttinfo_list.append(tti) 
+ 
+        # Replace ttinfo indexes for ttinfo objects. 
+        out.trans_idx = [out.ttinfo_list[idx] for idx in out.trans_idx] 
+ 
+        # Set standard, dst, and before ttinfos. before will be 
+        # used when a given time is before any transitions, 
+        # and will be set to the first non-dst ttinfo, or to 
+        # the first dst, if all of them are dst. 
+        out.ttinfo_std = None 
+        out.ttinfo_dst = None 
+        out.ttinfo_before = None 
+        if out.ttinfo_list: 
+            if not out.trans_list_utc: 
+                out.ttinfo_std = out.ttinfo_first = out.ttinfo_list[0] 
+            else: 
+                for i in range(timecnt-1, -1, -1): 
+                    tti = out.trans_idx[i] 
+                    if not out.ttinfo_std and not tti.isdst: 
+                        out.ttinfo_std = tti 
+                    elif not out.ttinfo_dst and tti.isdst: 
+                        out.ttinfo_dst = tti 
+ 
+                    if out.ttinfo_std and out.ttinfo_dst: 
+                        break 
+                else: 
+                    if out.ttinfo_dst and not out.ttinfo_std: 
+                        out.ttinfo_std = out.ttinfo_dst 
+ 
+                for tti in out.ttinfo_list: 
+                    if not tti.isdst: 
+                        out.ttinfo_before = tti 
+                        break 
+                else: 
+                    out.ttinfo_before = out.ttinfo_list[0] 
+ 
+        # Now fix transition times to become relative to wall time. 
+        # 
+        # I'm not sure about this. In my tests, the tz source file 
+        # is setup to wall time, and in the binary file isstd and 
+        # isgmt are off, so it should be in wall time. OTOH, it's 
+        # always in gmt time. Let me know if you have comments 
+        # about this. 
         lastdst = None
         lastoffset = None
         lastdstoffset = None
         lastbaseoffset = None
-        out.trans_list = []
+        out.trans_list = [] 
 
-        for i, tti in enumerate(out.trans_idx):
+        for i, tti in enumerate(out.trans_idx): 
             offset = tti.offset
             dstoffset = 0
-
+ 
             if lastdst is not None:
                 if tti.isdst:
                     if not lastdst:
                         dstoffset = offset - lastoffset
-
+ 
                     if not dstoffset and lastdstoffset:
                         dstoffset = lastdstoffset
-
+ 
                     tti.dstoffset = datetime.timedelta(seconds=dstoffset)
                     lastdstoffset = dstoffset
-
+ 
             # If a time zone changes its base offset during a DST transition,
             # then you need to adjust by the previous base offset to get the
             # transition time in local time. Otherwise you use the current
@@ -696,371 +696,371 @@ class tzfile(_tzinfo):
                     and tti.isdst != lastdst):
                 # The base DST has changed
                 adjustment = lastbaseoffset
-
+ 
             lastdst = tti.isdst
             lastoffset = offset
             lastbaseoffset = baseoffset
-
+ 
             out.trans_list.append(out.trans_list_utc[i] + adjustment)
 
-        out.trans_idx = tuple(out.trans_idx)
-        out.trans_list = tuple(out.trans_list)
-        out.trans_list_utc = tuple(out.trans_list_utc)
-
-        return out
-
-    def _find_last_transition(self, dt, in_utc=False):
-        # If there's no list, there are no transitions to find
-        if not self._trans_list:
-            return None
-
-        timestamp = _datetime_to_timestamp(dt)
-
-        # Find where the timestamp fits in the transition list - if the
-        # timestamp is a transition time, it's part of the "after" period.
-        trans_list = self._trans_list_utc if in_utc else self._trans_list
-        idx = bisect.bisect_right(trans_list, timestamp)
-
-        # We want to know when the previous transition was, so subtract off 1
+        out.trans_idx = tuple(out.trans_idx) 
+        out.trans_list = tuple(out.trans_list) 
+        out.trans_list_utc = tuple(out.trans_list_utc) 
+ 
+        return out 
+ 
+    def _find_last_transition(self, dt, in_utc=False): 
+        # If there's no list, there are no transitions to find 
+        if not self._trans_list: 
+            return None 
+ 
+        timestamp = _datetime_to_timestamp(dt) 
+ 
+        # Find where the timestamp fits in the transition list - if the 
+        # timestamp is a transition time, it's part of the "after" period. 
+        trans_list = self._trans_list_utc if in_utc else self._trans_list 
+        idx = bisect.bisect_right(trans_list, timestamp) 
+ 
+        # We want to know when the previous transition was, so subtract off 1 
         return idx - 1
-
-    def _get_ttinfo(self, idx):
-        # For no list or after the last transition, default to _ttinfo_std
-        if idx is None or (idx + 1) >= len(self._trans_list):
-            return self._ttinfo_std
-
-        # If there is a list and the time is before it, return _ttinfo_before
-        if idx < 0:
-            return self._ttinfo_before
-
-        return self._trans_idx[idx]
-
-    def _find_ttinfo(self, dt):
-        idx = self._resolve_ambiguous_time(dt)
-
-        return self._get_ttinfo(idx)
-
-    def fromutc(self, dt):
-        """
-        The ``tzfile`` implementation of :py:func:`datetime.tzinfo.fromutc`.
-
-        :param dt:
-            A :py:class:`datetime.datetime` object.
-
-        :raises TypeError:
-            Raised if ``dt`` is not a :py:class:`datetime.datetime` object.
-
-        :raises ValueError:
-            Raised if this is called with a ``dt`` which does not have this
-            ``tzinfo`` attached.
-
-        :return:
-            Returns a :py:class:`datetime.datetime` object representing the
-            wall time in ``self``'s time zone.
-        """
-        # These isinstance checks are in datetime.tzinfo, so we'll preserve
-        # them, even if we don't care about duck typing.
-        if not isinstance(dt, datetime.datetime):
-            raise TypeError("fromutc() requires a datetime argument")
-
-        if dt.tzinfo is not self:
-            raise ValueError("dt.tzinfo is not self")
-
-        # First treat UTC as wall time and get the transition we're in.
-        idx = self._find_last_transition(dt, in_utc=True)
-        tti = self._get_ttinfo(idx)
-
-        dt_out = dt + datetime.timedelta(seconds=tti.offset)
-
-        fold = self.is_ambiguous(dt_out, idx=idx)
-
-        return enfold(dt_out, fold=int(fold))
-
-    def is_ambiguous(self, dt, idx=None):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        if idx is None:
-            idx = self._find_last_transition(dt)
-
-        # Calculate the difference in offsets from current to previous
-        timestamp = _datetime_to_timestamp(dt)
-        tti = self._get_ttinfo(idx)
-
-        if idx is None or idx <= 0:
-            return False
-
-        od = self._get_ttinfo(idx - 1).offset - tti.offset
-        tt = self._trans_list[idx]          # Transition time
-
-        return timestamp < tt + od
-
-    def _resolve_ambiguous_time(self, dt):
-        idx = self._find_last_transition(dt)
-
-        # If we have no transitions, return the index
-        _fold = self._fold(dt)
-        if idx is None or idx == 0:
-            return idx
-
-        # If it's ambiguous and we're in a fold, shift to a different index.
-        idx_offset = int(not _fold and self.is_ambiguous(dt, idx))
-
-        return idx - idx_offset
-
-    def utcoffset(self, dt):
-        if dt is None:
-            return None
-
-        if not self._ttinfo_std:
-            return ZERO
-
-        return self._find_ttinfo(dt).delta
-
-    def dst(self, dt):
-        if dt is None:
-            return None
-
-        if not self._ttinfo_dst:
-            return ZERO
-
-        tti = self._find_ttinfo(dt)
-
-        if not tti.isdst:
-            return ZERO
-
-        # The documentation says that utcoffset()-dst() must
-        # be constant for every dt.
-        return tti.dstoffset
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        if not self._ttinfo_std or dt is None:
-            return None
-        return self._find_ttinfo(dt).abbr
-
-    def __eq__(self, other):
-        if not isinstance(other, tzfile):
-            return NotImplemented
-        return (self._trans_list == other._trans_list and
-                self._trans_idx == other._trans_idx and
-                self._ttinfo_list == other._ttinfo_list)
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, repr(self._filename))
-
-    def __reduce__(self):
-        return self.__reduce_ex__(None)
-
-    def __reduce_ex__(self, protocol):
-        return (self.__class__, (None, self._filename), self.__dict__)
-
-
-class tzrange(tzrangebase):
-    """
-    The ``tzrange`` object is a time zone specified by a set of offsets and
-    abbreviations, equivalent to the way the ``TZ`` variable can be specified
-    in POSIX-like systems, but using Python delta objects to specify DST
-    start, end and offsets.
-
-    :param stdabbr:
-        The abbreviation for standard time (e.g. ``'EST'``).
-
-    :param stdoffset:
-        An integer or :class:`datetime.timedelta` object or equivalent
-        specifying the base offset from UTC.
-
-        If unspecified, +00:00 is used.
-
-    :param dstabbr:
-        The abbreviation for DST / "Summer" time (e.g. ``'EDT'``).
-
-        If specified, with no other DST information, DST is assumed to occur
-        and the default behavior or ``dstoffset``, ``start`` and ``end`` is
-        used. If unspecified and no other DST information is specified, it
-        is assumed that this zone has no DST.
-
-        If this is unspecified and other DST information is *is* specified,
-        DST occurs in the zone but the time zone abbreviation is left
-        unchanged.
-
-    :param dstoffset:
-        A an integer or :class:`datetime.timedelta` object or equivalent
-        specifying the UTC offset during DST. If unspecified and any other DST
-        information is specified, it is assumed to be the STD offset +1 hour.
-
-    :param start:
-        A :class:`relativedelta.relativedelta` object or equivalent specifying
+ 
+    def _get_ttinfo(self, idx): 
+        # For no list or after the last transition, default to _ttinfo_std 
+        if idx is None or (idx + 1) >= len(self._trans_list): 
+            return self._ttinfo_std 
+ 
+        # If there is a list and the time is before it, return _ttinfo_before 
+        if idx < 0: 
+            return self._ttinfo_before 
+ 
+        return self._trans_idx[idx] 
+ 
+    def _find_ttinfo(self, dt): 
+        idx = self._resolve_ambiguous_time(dt) 
+ 
+        return self._get_ttinfo(idx) 
+ 
+    def fromutc(self, dt): 
+        """ 
+        The ``tzfile`` implementation of :py:func:`datetime.tzinfo.fromutc`. 
+ 
+        :param dt: 
+            A :py:class:`datetime.datetime` object. 
+ 
+        :raises TypeError: 
+            Raised if ``dt`` is not a :py:class:`datetime.datetime` object. 
+ 
+        :raises ValueError: 
+            Raised if this is called with a ``dt`` which does not have this 
+            ``tzinfo`` attached. 
+ 
+        :return: 
+            Returns a :py:class:`datetime.datetime` object representing the 
+            wall time in ``self``'s time zone. 
+        """ 
+        # These isinstance checks are in datetime.tzinfo, so we'll preserve 
+        # them, even if we don't care about duck typing. 
+        if not isinstance(dt, datetime.datetime): 
+            raise TypeError("fromutc() requires a datetime argument") 
+ 
+        if dt.tzinfo is not self: 
+            raise ValueError("dt.tzinfo is not self") 
+ 
+        # First treat UTC as wall time and get the transition we're in. 
+        idx = self._find_last_transition(dt, in_utc=True) 
+        tti = self._get_ttinfo(idx) 
+ 
+        dt_out = dt + datetime.timedelta(seconds=tti.offset) 
+ 
+        fold = self.is_ambiguous(dt_out, idx=idx) 
+ 
+        return enfold(dt_out, fold=int(fold)) 
+ 
+    def is_ambiguous(self, dt, idx=None): 
+        """ 
+        Whether or not the "wall time" of a given datetime is ambiguous in this 
+        zone. 
+ 
+        :param dt: 
+            A :py:class:`datetime.datetime`, naive or time zone aware. 
+ 
+ 
+        :return: 
+            Returns ``True`` if ambiguous, ``False`` otherwise. 
+ 
+        .. versionadded:: 2.6.0 
+        """ 
+        if idx is None: 
+            idx = self._find_last_transition(dt) 
+ 
+        # Calculate the difference in offsets from current to previous 
+        timestamp = _datetime_to_timestamp(dt) 
+        tti = self._get_ttinfo(idx) 
+ 
+        if idx is None or idx <= 0: 
+            return False 
+ 
+        od = self._get_ttinfo(idx - 1).offset - tti.offset 
+        tt = self._trans_list[idx]          # Transition time 
+ 
+        return timestamp < tt + od 
+ 
+    def _resolve_ambiguous_time(self, dt): 
+        idx = self._find_last_transition(dt) 
+ 
+        # If we have no transitions, return the index 
+        _fold = self._fold(dt) 
+        if idx is None or idx == 0: 
+            return idx 
+ 
+        # If it's ambiguous and we're in a fold, shift to a different index. 
+        idx_offset = int(not _fold and self.is_ambiguous(dt, idx)) 
+ 
+        return idx - idx_offset 
+ 
+    def utcoffset(self, dt): 
+        if dt is None: 
+            return None 
+ 
+        if not self._ttinfo_std: 
+            return ZERO 
+ 
+        return self._find_ttinfo(dt).delta 
+ 
+    def dst(self, dt): 
+        if dt is None: 
+            return None 
+ 
+        if not self._ttinfo_dst: 
+            return ZERO 
+ 
+        tti = self._find_ttinfo(dt) 
+ 
+        if not tti.isdst: 
+            return ZERO 
+ 
+        # The documentation says that utcoffset()-dst() must 
+        # be constant for every dt. 
+        return tti.dstoffset 
+ 
+    @tzname_in_python2 
+    def tzname(self, dt): 
+        if not self._ttinfo_std or dt is None: 
+            return None 
+        return self._find_ttinfo(dt).abbr 
+ 
+    def __eq__(self, other): 
+        if not isinstance(other, tzfile): 
+            return NotImplemented 
+        return (self._trans_list == other._trans_list and 
+                self._trans_idx == other._trans_idx and 
+                self._ttinfo_list == other._ttinfo_list) 
+ 
+    __hash__ = None 
+ 
+    def __ne__(self, other): 
+        return not (self == other) 
+ 
+    def __repr__(self): 
+        return "%s(%s)" % (self.__class__.__name__, repr(self._filename)) 
+ 
+    def __reduce__(self): 
+        return self.__reduce_ex__(None) 
+ 
+    def __reduce_ex__(self, protocol): 
+        return (self.__class__, (None, self._filename), self.__dict__) 
+ 
+ 
+class tzrange(tzrangebase): 
+    """ 
+    The ``tzrange`` object is a time zone specified by a set of offsets and 
+    abbreviations, equivalent to the way the ``TZ`` variable can be specified 
+    in POSIX-like systems, but using Python delta objects to specify DST 
+    start, end and offsets. 
+ 
+    :param stdabbr: 
+        The abbreviation for standard time (e.g. ``'EST'``). 
+ 
+    :param stdoffset: 
+        An integer or :class:`datetime.timedelta` object or equivalent 
+        specifying the base offset from UTC. 
+ 
+        If unspecified, +00:00 is used. 
+ 
+    :param dstabbr: 
+        The abbreviation for DST / "Summer" time (e.g. ``'EDT'``). 
+ 
+        If specified, with no other DST information, DST is assumed to occur 
+        and the default behavior or ``dstoffset``, ``start`` and ``end`` is 
+        used. If unspecified and no other DST information is specified, it 
+        is assumed that this zone has no DST. 
+ 
+        If this is unspecified and other DST information is *is* specified, 
+        DST occurs in the zone but the time zone abbreviation is left 
+        unchanged. 
+ 
+    :param dstoffset: 
+        A an integer or :class:`datetime.timedelta` object or equivalent 
+        specifying the UTC offset during DST. If unspecified and any other DST 
+        information is specified, it is assumed to be the STD offset +1 hour. 
+ 
+    :param start: 
+        A :class:`relativedelta.relativedelta` object or equivalent specifying 
         the time and time of year that daylight savings time starts. To
         specify, for example, that DST starts at 2AM on the 2nd Sunday in
         March, pass:
-
-            ``relativedelta(hours=2, month=3, day=1, weekday=SU(+2))``
-
-        If unspecified and any other DST information is specified, the default
-        value is 2 AM on the first Sunday in April.
-
-    :param end:
+ 
+            ``relativedelta(hours=2, month=3, day=1, weekday=SU(+2))`` 
+ 
+        If unspecified and any other DST information is specified, the default 
+        value is 2 AM on the first Sunday in April. 
+ 
+    :param end: 
         A :class:`relativedelta.relativedelta` object or equivalent
         representing the time and time of year that daylight savings time
         ends, with the same specification method as in ``start``. One note is
         that this should point to the first time in the *standard* zone, so if
         a transition occurs at 2AM in the DST zone and the clocks are set back
         1 hour to 1AM, set the ``hours`` parameter to +1.
-
-
-    **Examples:**
-
-    .. testsetup:: tzrange
-
-        from dateutil.tz import tzrange, tzstr
-
-    .. doctest:: tzrange
-
-        >>> tzstr('EST5EDT') == tzrange("EST", -18000, "EDT")
-        True
-
-        >>> from dateutil.relativedelta import *
-        >>> range1 = tzrange("EST", -18000, "EDT")
-        >>> range2 = tzrange("EST", -18000, "EDT", -14400,
-        ...                  relativedelta(hours=+2, month=4, day=1,
-        ...                                weekday=SU(+1)),
-        ...                  relativedelta(hours=+1, month=10, day=31,
-        ...                                weekday=SU(-1)))
-        >>> tzstr('EST5EDT') == range1 == range2
-        True
-
-    """
-    def __init__(self, stdabbr, stdoffset=None,
-                 dstabbr=None, dstoffset=None,
-                 start=None, end=None):
-
-        global relativedelta
-        from dateutil import relativedelta
-
-        self._std_abbr = stdabbr
-        self._dst_abbr = dstabbr
-
-        try:
+ 
+ 
+    **Examples:** 
+ 
+    .. testsetup:: tzrange 
+ 
+        from dateutil.tz import tzrange, tzstr 
+ 
+    .. doctest:: tzrange 
+ 
+        >>> tzstr('EST5EDT') == tzrange("EST", -18000, "EDT") 
+        True 
+ 
+        >>> from dateutil.relativedelta import * 
+        >>> range1 = tzrange("EST", -18000, "EDT") 
+        >>> range2 = tzrange("EST", -18000, "EDT", -14400, 
+        ...                  relativedelta(hours=+2, month=4, day=1, 
+        ...                                weekday=SU(+1)), 
+        ...                  relativedelta(hours=+1, month=10, day=31, 
+        ...                                weekday=SU(-1))) 
+        >>> tzstr('EST5EDT') == range1 == range2 
+        True 
+ 
+    """ 
+    def __init__(self, stdabbr, stdoffset=None, 
+                 dstabbr=None, dstoffset=None, 
+                 start=None, end=None): 
+ 
+        global relativedelta 
+        from dateutil import relativedelta 
+ 
+        self._std_abbr = stdabbr 
+        self._dst_abbr = dstabbr 
+ 
+        try: 
             stdoffset = stdoffset.total_seconds()
-        except (TypeError, AttributeError):
-            pass
-
-        try:
+        except (TypeError, AttributeError): 
+            pass 
+ 
+        try: 
             dstoffset = dstoffset.total_seconds()
-        except (TypeError, AttributeError):
-            pass
-
-        if stdoffset is not None:
-            self._std_offset = datetime.timedelta(seconds=stdoffset)
-        else:
-            self._std_offset = ZERO
-
-        if dstoffset is not None:
-            self._dst_offset = datetime.timedelta(seconds=dstoffset)
-        elif dstabbr and stdoffset is not None:
-            self._dst_offset = self._std_offset + datetime.timedelta(hours=+1)
-        else:
-            self._dst_offset = ZERO
-
-        if dstabbr and start is None:
-            self._start_delta = relativedelta.relativedelta(
-                hours=+2, month=4, day=1, weekday=relativedelta.SU(+1))
-        else:
-            self._start_delta = start
-
-        if dstabbr and end is None:
-            self._end_delta = relativedelta.relativedelta(
-                hours=+1, month=10, day=31, weekday=relativedelta.SU(-1))
-        else:
-            self._end_delta = end
-
-        self._dst_base_offset_ = self._dst_offset - self._std_offset
-        self.hasdst = bool(self._start_delta)
-
-    def transitions(self, year):
-        """
-        For a given year, get the DST on and off transition times, expressed
-        always on the standard time side. For zones with no transitions, this
-        function returns ``None``.
-
-        :param year:
-            The year whose transitions you would like to query.
-
-        :return:
-            Returns a :class:`tuple` of :class:`datetime.datetime` objects,
-            ``(dston, dstoff)`` for zones with an annual DST transition, or
-            ``None`` for fixed offset zones.
-        """
-        if not self.hasdst:
-            return None
-
-        base_year = datetime.datetime(year, 1, 1)
-
-        start = base_year + self._start_delta
-        end = base_year + self._end_delta
-
-        return (start, end)
-
-    def __eq__(self, other):
-        if not isinstance(other, tzrange):
-            return NotImplemented
-
-        return (self._std_abbr == other._std_abbr and
-                self._dst_abbr == other._dst_abbr and
-                self._std_offset == other._std_offset and
-                self._dst_offset == other._dst_offset and
-                self._start_delta == other._start_delta and
-                self._end_delta == other._end_delta)
-
-    @property
-    def _dst_base_offset(self):
-        return self._dst_base_offset_
-
-
+        except (TypeError, AttributeError): 
+            pass 
+ 
+        if stdoffset is not None: 
+            self._std_offset = datetime.timedelta(seconds=stdoffset) 
+        else: 
+            self._std_offset = ZERO 
+ 
+        if dstoffset is not None: 
+            self._dst_offset = datetime.timedelta(seconds=dstoffset) 
+        elif dstabbr and stdoffset is not None: 
+            self._dst_offset = self._std_offset + datetime.timedelta(hours=+1) 
+        else: 
+            self._dst_offset = ZERO 
+ 
+        if dstabbr and start is None: 
+            self._start_delta = relativedelta.relativedelta( 
+                hours=+2, month=4, day=1, weekday=relativedelta.SU(+1)) 
+        else: 
+            self._start_delta = start 
+ 
+        if dstabbr and end is None: 
+            self._end_delta = relativedelta.relativedelta( 
+                hours=+1, month=10, day=31, weekday=relativedelta.SU(-1)) 
+        else: 
+            self._end_delta = end 
+ 
+        self._dst_base_offset_ = self._dst_offset - self._std_offset 
+        self.hasdst = bool(self._start_delta) 
+ 
+    def transitions(self, year): 
+        """ 
+        For a given year, get the DST on and off transition times, expressed 
+        always on the standard time side. For zones with no transitions, this 
+        function returns ``None``. 
+ 
+        :param year: 
+            The year whose transitions you would like to query. 
+ 
+        :return: 
+            Returns a :class:`tuple` of :class:`datetime.datetime` objects, 
+            ``(dston, dstoff)`` for zones with an annual DST transition, or 
+            ``None`` for fixed offset zones. 
+        """ 
+        if not self.hasdst: 
+            return None 
+ 
+        base_year = datetime.datetime(year, 1, 1) 
+ 
+        start = base_year + self._start_delta 
+        end = base_year + self._end_delta 
+ 
+        return (start, end) 
+ 
+    def __eq__(self, other): 
+        if not isinstance(other, tzrange): 
+            return NotImplemented 
+ 
+        return (self._std_abbr == other._std_abbr and 
+                self._dst_abbr == other._dst_abbr and 
+                self._std_offset == other._std_offset and 
+                self._dst_offset == other._dst_offset and 
+                self._start_delta == other._start_delta and 
+                self._end_delta == other._end_delta) 
+ 
+    @property 
+    def _dst_base_offset(self): 
+        return self._dst_base_offset_ 
+ 
+ 
 @six.add_metaclass(_TzStrFactory)
-class tzstr(tzrange):
-    """
-    ``tzstr`` objects are time zone objects specified by a time-zone string as
-    it would be passed to a ``TZ`` variable on POSIX-style systems (see
-    the `GNU C Library: TZ Variable`_ for more details).
-
-    There is one notable exception, which is that POSIX-style time zones use an
-    inverted offset format, so normally ``GMT+3`` would be parsed as an offset
-    3 hours *behind* GMT. The ``tzstr`` time zone object will parse this as an
-    offset 3 hours *ahead* of GMT. If you would like to maintain the POSIX
-    behavior, pass a ``True`` value to ``posix_offset``.
-
-    The :class:`tzrange` object provides the same functionality, but is
-    specified using :class:`relativedelta.relativedelta` objects. rather than
-    strings.
-
-    :param s:
-        A time zone string in ``TZ`` variable format. This can be a
+class tzstr(tzrange): 
+    """ 
+    ``tzstr`` objects are time zone objects specified by a time-zone string as 
+    it would be passed to a ``TZ`` variable on POSIX-style systems (see 
+    the `GNU C Library: TZ Variable`_ for more details). 
+ 
+    There is one notable exception, which is that POSIX-style time zones use an 
+    inverted offset format, so normally ``GMT+3`` would be parsed as an offset 
+    3 hours *behind* GMT. The ``tzstr`` time zone object will parse this as an 
+    offset 3 hours *ahead* of GMT. If you would like to maintain the POSIX 
+    behavior, pass a ``True`` value to ``posix_offset``. 
+ 
+    The :class:`tzrange` object provides the same functionality, but is 
+    specified using :class:`relativedelta.relativedelta` objects. rather than 
+    strings. 
+ 
+    :param s: 
+        A time zone string in ``TZ`` variable format. This can be a 
         :class:`bytes` (2.x: :class:`str`), :class:`str` (2.x:
         :class:`unicode`) or a stream emitting unicode characters
         (e.g. :class:`StringIO`).
-
-    :param posix_offset:
-        Optional. If set to ``True``, interpret strings such as ``GMT+3`` or
-        ``UTC+3`` as being 3 hours *behind* UTC rather than ahead, per the
-        POSIX standard.
-
+ 
+    :param posix_offset: 
+        Optional. If set to ``True``, interpret strings such as ``GMT+3`` or 
+        ``UTC+3`` as being 3 hours *behind* UTC rather than ahead, per the 
+        POSIX standard. 
+ 
     .. caution::
 
         Prior to version 2.7.0, this function also supported time zones
@@ -1073,340 +1073,340 @@ class tzstr(tzrange):
         will raise a :class:`DeprecatedTZFormatWarning` until
         support is removed in a future version.
 
-    .. _`GNU C Library: TZ Variable`:
-        https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
-    """
-    def __init__(self, s, posix_offset=False):
-        global parser
+    .. _`GNU C Library: TZ Variable`: 
+        https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html 
+    """ 
+    def __init__(self, s, posix_offset=False): 
+        global parser 
         from dateutil.parser import _parser as parser
-
-        self._s = s
-
-        res = parser._parsetz(s)
+ 
+        self._s = s 
+ 
+        res = parser._parsetz(s) 
         if res is None or res.any_unused_tokens:
-            raise ValueError("unknown string format")
-
-        # Here we break the compatibility with the TZ variable handling.
-        # GMT-3 actually *means* the timezone -3.
-        if res.stdabbr in ("GMT", "UTC") and not posix_offset:
-            res.stdoffset *= -1
-
-        # We must initialize it first, since _delta() needs
-        # _std_offset and _dst_offset set. Use False in start/end
-        # to avoid building it two times.
-        tzrange.__init__(self, res.stdabbr, res.stdoffset,
-                         res.dstabbr, res.dstoffset,
-                         start=False, end=False)
-
-        if not res.dstabbr:
-            self._start_delta = None
-            self._end_delta = None
-        else:
-            self._start_delta = self._delta(res.start)
-            if self._start_delta:
-                self._end_delta = self._delta(res.end, isend=1)
-
-        self.hasdst = bool(self._start_delta)
-
-    def _delta(self, x, isend=0):
-        from dateutil import relativedelta
-        kwargs = {}
-        if x.month is not None:
-            kwargs["month"] = x.month
-            if x.weekday is not None:
-                kwargs["weekday"] = relativedelta.weekday(x.weekday, x.week)
-                if x.week > 0:
-                    kwargs["day"] = 1
-                else:
-                    kwargs["day"] = 31
-            elif x.day:
-                kwargs["day"] = x.day
-        elif x.yday is not None:
-            kwargs["yearday"] = x.yday
-        elif x.jyday is not None:
-            kwargs["nlyearday"] = x.jyday
-        if not kwargs:
-            # Default is to start on first sunday of april, and end
-            # on last sunday of october.
-            if not isend:
-                kwargs["month"] = 4
-                kwargs["day"] = 1
-                kwargs["weekday"] = relativedelta.SU(+1)
-            else:
-                kwargs["month"] = 10
-                kwargs["day"] = 31
-                kwargs["weekday"] = relativedelta.SU(-1)
-        if x.time is not None:
-            kwargs["seconds"] = x.time
-        else:
-            # Default is 2AM.
-            kwargs["seconds"] = 7200
-        if isend:
-            # Convert to standard time, to follow the documented way
-            # of working with the extra hour. See the documentation
-            # of the tzinfo class.
-            delta = self._dst_offset - self._std_offset
-            kwargs["seconds"] -= delta.seconds + delta.days * 86400
-        return relativedelta.relativedelta(**kwargs)
-
-    def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, repr(self._s))
-
-
-class _tzicalvtzcomp(object):
-    def __init__(self, tzoffsetfrom, tzoffsetto, isdst,
-                 tzname=None, rrule=None):
-        self.tzoffsetfrom = datetime.timedelta(seconds=tzoffsetfrom)
-        self.tzoffsetto = datetime.timedelta(seconds=tzoffsetto)
-        self.tzoffsetdiff = self.tzoffsetto - self.tzoffsetfrom
-        self.isdst = isdst
-        self.tzname = tzname
-        self.rrule = rrule
-
-
-class _tzicalvtz(_tzinfo):
-    def __init__(self, tzid, comps=[]):
-        super(_tzicalvtz, self).__init__()
-
-        self._tzid = tzid
-        self._comps = comps
-        self._cachedate = []
-        self._cachecomp = []
+            raise ValueError("unknown string format") 
+ 
+        # Here we break the compatibility with the TZ variable handling. 
+        # GMT-3 actually *means* the timezone -3. 
+        if res.stdabbr in ("GMT", "UTC") and not posix_offset: 
+            res.stdoffset *= -1 
+ 
+        # We must initialize it first, since _delta() needs 
+        # _std_offset and _dst_offset set. Use False in start/end 
+        # to avoid building it two times. 
+        tzrange.__init__(self, res.stdabbr, res.stdoffset, 
+                         res.dstabbr, res.dstoffset, 
+                         start=False, end=False) 
+ 
+        if not res.dstabbr: 
+            self._start_delta = None 
+            self._end_delta = None 
+        else: 
+            self._start_delta = self._delta(res.start) 
+            if self._start_delta: 
+                self._end_delta = self._delta(res.end, isend=1) 
+ 
+        self.hasdst = bool(self._start_delta) 
+ 
+    def _delta(self, x, isend=0): 
+        from dateutil import relativedelta 
+        kwargs = {} 
+        if x.month is not None: 
+            kwargs["month"] = x.month 
+            if x.weekday is not None: 
+                kwargs["weekday"] = relativedelta.weekday(x.weekday, x.week) 
+                if x.week > 0: 
+                    kwargs["day"] = 1 
+                else: 
+                    kwargs["day"] = 31 
+            elif x.day: 
+                kwargs["day"] = x.day 
+        elif x.yday is not None: 
+            kwargs["yearday"] = x.yday 
+        elif x.jyday is not None: 
+            kwargs["nlyearday"] = x.jyday 
+        if not kwargs: 
+            # Default is to start on first sunday of april, and end 
+            # on last sunday of october. 
+            if not isend: 
+                kwargs["month"] = 4 
+                kwargs["day"] = 1 
+                kwargs["weekday"] = relativedelta.SU(+1) 
+            else: 
+                kwargs["month"] = 10 
+                kwargs["day"] = 31 
+                kwargs["weekday"] = relativedelta.SU(-1) 
+        if x.time is not None: 
+            kwargs["seconds"] = x.time 
+        else: 
+            # Default is 2AM. 
+            kwargs["seconds"] = 7200 
+        if isend: 
+            # Convert to standard time, to follow the documented way 
+            # of working with the extra hour. See the documentation 
+            # of the tzinfo class. 
+            delta = self._dst_offset - self._std_offset 
+            kwargs["seconds"] -= delta.seconds + delta.days * 86400 
+        return relativedelta.relativedelta(**kwargs) 
+ 
+    def __repr__(self): 
+        return "%s(%s)" % (self.__class__.__name__, repr(self._s)) 
+ 
+ 
+class _tzicalvtzcomp(object): 
+    def __init__(self, tzoffsetfrom, tzoffsetto, isdst, 
+                 tzname=None, rrule=None): 
+        self.tzoffsetfrom = datetime.timedelta(seconds=tzoffsetfrom) 
+        self.tzoffsetto = datetime.timedelta(seconds=tzoffsetto) 
+        self.tzoffsetdiff = self.tzoffsetto - self.tzoffsetfrom 
+        self.isdst = isdst 
+        self.tzname = tzname 
+        self.rrule = rrule 
+ 
+ 
+class _tzicalvtz(_tzinfo): 
+    def __init__(self, tzid, comps=[]): 
+        super(_tzicalvtz, self).__init__() 
+ 
+        self._tzid = tzid 
+        self._comps = comps 
+        self._cachedate = [] 
+        self._cachecomp = [] 
         self._cache_lock = _thread.allocate_lock()
-
-    def _find_comp(self, dt):
-        if len(self._comps) == 1:
-            return self._comps[0]
-
-        dt = dt.replace(tzinfo=None)
-
-        try:
+ 
+    def _find_comp(self, dt): 
+        if len(self._comps) == 1: 
+            return self._comps[0] 
+ 
+        dt = dt.replace(tzinfo=None) 
+ 
+        try: 
             with self._cache_lock:
                 return self._cachecomp[self._cachedate.index(
                     (dt, self._fold(dt)))]
-        except ValueError:
-            pass
-
-        lastcompdt = None
-        lastcomp = None
-
-        for comp in self._comps:
-            compdt = self._find_compdt(comp, dt)
-
-            if compdt and (not lastcompdt or lastcompdt < compdt):
-                lastcompdt = compdt
-                lastcomp = comp
-
-        if not lastcomp:
-            # RFC says nothing about what to do when a given
-            # time is before the first onset date. We'll look for the
-            # first standard component, or the first component, if
-            # none is found.
-            for comp in self._comps:
-                if not comp.isdst:
-                    lastcomp = comp
-                    break
-            else:
-                lastcomp = comp[0]
-
+        except ValueError: 
+            pass 
+ 
+        lastcompdt = None 
+        lastcomp = None 
+ 
+        for comp in self._comps: 
+            compdt = self._find_compdt(comp, dt) 
+ 
+            if compdt and (not lastcompdt or lastcompdt < compdt): 
+                lastcompdt = compdt 
+                lastcomp = comp 
+ 
+        if not lastcomp: 
+            # RFC says nothing about what to do when a given 
+            # time is before the first onset date. We'll look for the 
+            # first standard component, or the first component, if 
+            # none is found. 
+            for comp in self._comps: 
+                if not comp.isdst: 
+                    lastcomp = comp 
+                    break 
+            else: 
+                lastcomp = comp[0] 
+ 
         with self._cache_lock:
             self._cachedate.insert(0, (dt, self._fold(dt)))
             self._cachecomp.insert(0, lastcomp)
-
+ 
             if len(self._cachedate) > 10:
                 self._cachedate.pop()
                 self._cachecomp.pop()
-
-        return lastcomp
-
-    def _find_compdt(self, comp, dt):
-        if comp.tzoffsetdiff < ZERO and self._fold(dt):
-            dt -= comp.tzoffsetdiff
-
-        compdt = comp.rrule.before(dt, inc=True)
-
-        return compdt
-
-    def utcoffset(self, dt):
-        if dt is None:
-            return None
-
-        return self._find_comp(dt).tzoffsetto
-
-    def dst(self, dt):
-        comp = self._find_comp(dt)
-        if comp.isdst:
-            return comp.tzoffsetdiff
-        else:
-            return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        return self._find_comp(dt).tzname
-
-    def __repr__(self):
-        return "<tzicalvtz %s>" % repr(self._tzid)
-
-    __reduce__ = object.__reduce__
-
-
-class tzical(object):
-    """
-    This object is designed to parse an iCalendar-style ``VTIMEZONE`` structure
+ 
+        return lastcomp 
+ 
+    def _find_compdt(self, comp, dt): 
+        if comp.tzoffsetdiff < ZERO and self._fold(dt): 
+            dt -= comp.tzoffsetdiff 
+ 
+        compdt = comp.rrule.before(dt, inc=True) 
+ 
+        return compdt 
+ 
+    def utcoffset(self, dt): 
+        if dt is None: 
+            return None 
+ 
+        return self._find_comp(dt).tzoffsetto 
+ 
+    def dst(self, dt): 
+        comp = self._find_comp(dt) 
+        if comp.isdst: 
+            return comp.tzoffsetdiff 
+        else: 
+            return ZERO 
+ 
+    @tzname_in_python2 
+    def tzname(self, dt): 
+        return self._find_comp(dt).tzname 
+ 
+    def __repr__(self): 
+        return "<tzicalvtz %s>" % repr(self._tzid) 
+ 
+    __reduce__ = object.__reduce__ 
+ 
+ 
+class tzical(object): 
+    """ 
+    This object is designed to parse an iCalendar-style ``VTIMEZONE`` structure 
     as set out in `RFC 5545`_ Section 4.6.5 into one or more `tzinfo` objects.
-
-    :param `fileobj`:
-        A file or stream in iCalendar format, which should be UTF-8 encoded
-        with CRLF endings.
-
+ 
+    :param `fileobj`: 
+        A file or stream in iCalendar format, which should be UTF-8 encoded 
+        with CRLF endings. 
+ 
     .. _`RFC 5545`: https://tools.ietf.org/html/rfc5545
-    """
-    def __init__(self, fileobj):
-        global rrule
-        from dateutil import rrule
-
-        if isinstance(fileobj, string_types):
-            self._s = fileobj
-            # ical should be encoded in UTF-8 with CRLF
-            fileobj = open(fileobj, 'r')
-        else:
-            self._s = getattr(fileobj, 'name', repr(fileobj))
+    """ 
+    def __init__(self, fileobj): 
+        global rrule 
+        from dateutil import rrule 
+ 
+        if isinstance(fileobj, string_types): 
+            self._s = fileobj 
+            # ical should be encoded in UTF-8 with CRLF 
+            fileobj = open(fileobj, 'r') 
+        else: 
+            self._s = getattr(fileobj, 'name', repr(fileobj)) 
             fileobj = _nullcontext(fileobj)
-
-        self._vtz = {}
-
-        with fileobj as fobj:
-            self._parse_rfc(fobj.read())
-
-    def keys(self):
-        """
-        Retrieves the available time zones as a list.
-        """
-        return list(self._vtz.keys())
-
-    def get(self, tzid=None):
-        """
-        Retrieve a :py:class:`datetime.tzinfo` object by its ``tzid``.
-
-        :param tzid:
-            If there is exactly one time zone available, omitting ``tzid``
-            or passing :py:const:`None` value returns it. Otherwise a valid
-            key (which can be retrieved from :func:`keys`) is required.
-
-        :raises ValueError:
-            Raised if ``tzid`` is not specified but there are either more
-            or fewer than 1 zone defined.
-
-        :returns:
-            Returns either a :py:class:`datetime.tzinfo` object representing
-            the relevant time zone or :py:const:`None` if the ``tzid`` was
-            not found.
-        """
-        if tzid is None:
-            if len(self._vtz) == 0:
-                raise ValueError("no timezones defined")
-            elif len(self._vtz) > 1:
-                raise ValueError("more than one timezone available")
-            tzid = next(iter(self._vtz))
-
-        return self._vtz.get(tzid)
-
-    def _parse_offset(self, s):
-        s = s.strip()
-        if not s:
-            raise ValueError("empty offset")
-        if s[0] in ('+', '-'):
-            signal = (-1, +1)[s[0] == '+']
-            s = s[1:]
-        else:
-            signal = +1
-        if len(s) == 4:
-            return (int(s[:2]) * 3600 + int(s[2:]) * 60) * signal
-        elif len(s) == 6:
-            return (int(s[:2]) * 3600 + int(s[2:4]) * 60 + int(s[4:])) * signal
-        else:
-            raise ValueError("invalid offset: " + s)
-
-    def _parse_rfc(self, s):
-        lines = s.splitlines()
-        if not lines:
-            raise ValueError("empty string")
-
-        # Unfold
-        i = 0
-        while i < len(lines):
-            line = lines[i].rstrip()
-            if not line:
-                del lines[i]
-            elif i > 0 and line[0] == " ":
-                lines[i-1] += line[1:]
-                del lines[i]
-            else:
-                i += 1
-
-        tzid = None
-        comps = []
-        invtz = False
-        comptype = None
-        for line in lines:
-            if not line:
-                continue
-            name, value = line.split(':', 1)
-            parms = name.split(';')
-            if not parms:
-                raise ValueError("empty property name")
-            name = parms[0].upper()
-            parms = parms[1:]
-            if invtz:
-                if name == "BEGIN":
-                    if value in ("STANDARD", "DAYLIGHT"):
-                        # Process component
-                        pass
-                    else:
-                        raise ValueError("unknown component: "+value)
-                    comptype = value
-                    founddtstart = False
-                    tzoffsetfrom = None
-                    tzoffsetto = None
-                    rrulelines = []
-                    tzname = None
-                elif name == "END":
-                    if value == "VTIMEZONE":
-                        if comptype:
-                            raise ValueError("component not closed: "+comptype)
-                        if not tzid:
-                            raise ValueError("mandatory TZID not found")
-                        if not comps:
-                            raise ValueError(
-                                "at least one component is needed")
-                        # Process vtimezone
-                        self._vtz[tzid] = _tzicalvtz(tzid, comps)
-                        invtz = False
-                    elif value == comptype:
-                        if not founddtstart:
-                            raise ValueError("mandatory DTSTART not found")
-                        if tzoffsetfrom is None:
-                            raise ValueError(
-                                "mandatory TZOFFSETFROM not found")
-                        if tzoffsetto is None:
-                            raise ValueError(
-                                "mandatory TZOFFSETFROM not found")
-                        # Process component
-                        rr = None
-                        if rrulelines:
-                            rr = rrule.rrulestr("\n".join(rrulelines),
-                                                compatible=True,
-                                                ignoretz=True,
-                                                cache=True)
-                        comp = _tzicalvtzcomp(tzoffsetfrom, tzoffsetto,
-                                              (comptype == "DAYLIGHT"),
-                                              tzname, rr)
-                        comps.append(comp)
-                        comptype = None
-                    else:
-                        raise ValueError("invalid component end: "+value)
-                elif comptype:
-                    if name == "DTSTART":
+ 
+        self._vtz = {} 
+ 
+        with fileobj as fobj: 
+            self._parse_rfc(fobj.read()) 
+ 
+    def keys(self): 
+        """ 
+        Retrieves the available time zones as a list. 
+        """ 
+        return list(self._vtz.keys()) 
+ 
+    def get(self, tzid=None): 
+        """ 
+        Retrieve a :py:class:`datetime.tzinfo` object by its ``tzid``. 
+ 
+        :param tzid: 
+            If there is exactly one time zone available, omitting ``tzid`` 
+            or passing :py:const:`None` value returns it. Otherwise a valid 
+            key (which can be retrieved from :func:`keys`) is required. 
+ 
+        :raises ValueError: 
+            Raised if ``tzid`` is not specified but there are either more 
+            or fewer than 1 zone defined. 
+ 
+        :returns: 
+            Returns either a :py:class:`datetime.tzinfo` object representing 
+            the relevant time zone or :py:const:`None` if the ``tzid`` was 
+            not found. 
+        """ 
+        if tzid is None: 
+            if len(self._vtz) == 0: 
+                raise ValueError("no timezones defined") 
+            elif len(self._vtz) > 1: 
+                raise ValueError("more than one timezone available") 
+            tzid = next(iter(self._vtz)) 
+ 
+        return self._vtz.get(tzid) 
+ 
+    def _parse_offset(self, s): 
+        s = s.strip() 
+        if not s: 
+            raise ValueError("empty offset") 
+        if s[0] in ('+', '-'): 
+            signal = (-1, +1)[s[0] == '+'] 
+            s = s[1:] 
+        else: 
+            signal = +1 
+        if len(s) == 4: 
+            return (int(s[:2]) * 3600 + int(s[2:]) * 60) * signal 
+        elif len(s) == 6: 
+            return (int(s[:2]) * 3600 + int(s[2:4]) * 60 + int(s[4:])) * signal 
+        else: 
+            raise ValueError("invalid offset: " + s) 
+ 
+    def _parse_rfc(self, s): 
+        lines = s.splitlines() 
+        if not lines: 
+            raise ValueError("empty string") 
+ 
+        # Unfold 
+        i = 0 
+        while i < len(lines): 
+            line = lines[i].rstrip() 
+            if not line: 
+                del lines[i] 
+            elif i > 0 and line[0] == " ": 
+                lines[i-1] += line[1:] 
+                del lines[i] 
+            else: 
+                i += 1 
+ 
+        tzid = None 
+        comps = [] 
+        invtz = False 
+        comptype = None 
+        for line in lines: 
+            if not line: 
+                continue 
+            name, value = line.split(':', 1) 
+            parms = name.split(';') 
+            if not parms: 
+                raise ValueError("empty property name") 
+            name = parms[0].upper() 
+            parms = parms[1:] 
+            if invtz: 
+                if name == "BEGIN": 
+                    if value in ("STANDARD", "DAYLIGHT"): 
+                        # Process component 
+                        pass 
+                    else: 
+                        raise ValueError("unknown component: "+value) 
+                    comptype = value 
+                    founddtstart = False 
+                    tzoffsetfrom = None 
+                    tzoffsetto = None 
+                    rrulelines = [] 
+                    tzname = None 
+                elif name == "END": 
+                    if value == "VTIMEZONE": 
+                        if comptype: 
+                            raise ValueError("component not closed: "+comptype) 
+                        if not tzid: 
+                            raise ValueError("mandatory TZID not found") 
+                        if not comps: 
+                            raise ValueError( 
+                                "at least one component is needed") 
+                        # Process vtimezone 
+                        self._vtz[tzid] = _tzicalvtz(tzid, comps) 
+                        invtz = False 
+                    elif value == comptype: 
+                        if not founddtstart: 
+                            raise ValueError("mandatory DTSTART not found") 
+                        if tzoffsetfrom is None: 
+                            raise ValueError( 
+                                "mandatory TZOFFSETFROM not found") 
+                        if tzoffsetto is None: 
+                            raise ValueError( 
+                                "mandatory TZOFFSETFROM not found") 
+                        # Process component 
+                        rr = None 
+                        if rrulelines: 
+                            rr = rrule.rrulestr("\n".join(rrulelines), 
+                                                compatible=True, 
+                                                ignoretz=True, 
+                                                cache=True) 
+                        comp = _tzicalvtzcomp(tzoffsetfrom, tzoffsetto, 
+                                              (comptype == "DAYLIGHT"), 
+                                              tzname, rr) 
+                        comps.append(comp) 
+                        comptype = None 
+                    else: 
+                        raise ValueError("invalid component end: "+value) 
+                elif comptype: 
+                    if name == "DTSTART": 
                         # DTSTART in VTIMEZONE takes a subset of valid RRULE
                         # values under RFC 5545.
                         for parm in parms:
@@ -1414,59 +1414,59 @@ class tzical(object):
                                 msg = ('Unsupported DTSTART param in ' +
                                        'VTIMEZONE: ' + parm)
                                 raise ValueError(msg)
-                        rrulelines.append(line)
-                        founddtstart = True
-                    elif name in ("RRULE", "RDATE", "EXRULE", "EXDATE"):
-                        rrulelines.append(line)
-                    elif name == "TZOFFSETFROM":
-                        if parms:
-                            raise ValueError(
-                                "unsupported %s parm: %s " % (name, parms[0]))
-                        tzoffsetfrom = self._parse_offset(value)
-                    elif name == "TZOFFSETTO":
-                        if parms:
-                            raise ValueError(
-                                "unsupported TZOFFSETTO parm: "+parms[0])
-                        tzoffsetto = self._parse_offset(value)
-                    elif name == "TZNAME":
-                        if parms:
-                            raise ValueError(
-                                "unsupported TZNAME parm: "+parms[0])
-                        tzname = value
-                    elif name == "COMMENT":
-                        pass
-                    else:
-                        raise ValueError("unsupported property: "+name)
-                else:
-                    if name == "TZID":
-                        if parms:
-                            raise ValueError(
-                                "unsupported TZID parm: "+parms[0])
-                        tzid = value
-                    elif name in ("TZURL", "LAST-MODIFIED", "COMMENT"):
-                        pass
-                    else:
-                        raise ValueError("unsupported property: "+name)
-            elif name == "BEGIN" and value == "VTIMEZONE":
-                tzid = None
-                comps = []
-                invtz = True
-
-    def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, repr(self._s))
-
-
-if sys.platform != "win32":
-    TZFILES = ["/etc/localtime", "localtime"]
-    TZPATHS = ["/usr/share/zoneinfo",
-               "/usr/lib/zoneinfo",
-               "/usr/share/lib/zoneinfo",
-               "/etc/zoneinfo"]
-else:
-    TZFILES = []
-    TZPATHS = []
-
-
+                        rrulelines.append(line) 
+                        founddtstart = True 
+                    elif name in ("RRULE", "RDATE", "EXRULE", "EXDATE"): 
+                        rrulelines.append(line) 
+                    elif name == "TZOFFSETFROM": 
+                        if parms: 
+                            raise ValueError( 
+                                "unsupported %s parm: %s " % (name, parms[0])) 
+                        tzoffsetfrom = self._parse_offset(value) 
+                    elif name == "TZOFFSETTO": 
+                        if parms: 
+                            raise ValueError( 
+                                "unsupported TZOFFSETTO parm: "+parms[0]) 
+                        tzoffsetto = self._parse_offset(value) 
+                    elif name == "TZNAME": 
+                        if parms: 
+                            raise ValueError( 
+                                "unsupported TZNAME parm: "+parms[0]) 
+                        tzname = value 
+                    elif name == "COMMENT": 
+                        pass 
+                    else: 
+                        raise ValueError("unsupported property: "+name) 
+                else: 
+                    if name == "TZID": 
+                        if parms: 
+                            raise ValueError( 
+                                "unsupported TZID parm: "+parms[0]) 
+                        tzid = value 
+                    elif name in ("TZURL", "LAST-MODIFIED", "COMMENT"): 
+                        pass 
+                    else: 
+                        raise ValueError("unsupported property: "+name) 
+            elif name == "BEGIN" and value == "VTIMEZONE": 
+                tzid = None 
+                comps = [] 
+                invtz = True 
+ 
+    def __repr__(self): 
+        return "%s(%s)" % (self.__class__.__name__, repr(self._s)) 
+ 
+ 
+if sys.platform != "win32": 
+    TZFILES = ["/etc/localtime", "localtime"] 
+    TZPATHS = ["/usr/share/zoneinfo", 
+               "/usr/lib/zoneinfo", 
+               "/usr/share/lib/zoneinfo", 
+               "/etc/zoneinfo"] 
+else: 
+    TZFILES = [] 
+    TZPATHS = [] 
+ 
+ 
 def __get_gettz():
     tzlocal_classes = (tzlocal,)
     if tzwinlocal is not None:
@@ -1614,7 +1614,7 @@ def __get_gettz():
                             pass
                 else:
                     tz = tzlocal()
-            else:
+            else: 
                 try:
                     if name.startswith(":"):
                         name = name[1:]
@@ -1628,7 +1628,7 @@ def __get_gettz():
                     if os.path.isfile(name):
                         tz = tzfile(name)
                     else:
-                        tz = None
+                        tz = None 
                 else:
                     for path in TZPATHS:
                         filepath = os.path.join(path, name)
@@ -1638,10 +1638,10 @@ def __get_gettz():
                                 continue
                         try:
                             tz = tzfile(filepath)
-                            break
+                            break 
                         except (IOError, OSError, ValueError):
                             pass
-                    else:
+                    else: 
                         tz = None
                         if tzwin is not None:
                             try:
@@ -1649,11 +1649,11 @@ def __get_gettz():
                             except (WindowsError, UnicodeEncodeError):
                                 # UnicodeEncodeError is for Python 2.7 compat
                                 tz = None
-
+ 
                         if not tz:
                             from dateutil.zoneinfo import get_zonefile_instance
                             tz = get_zonefile_instance().get(name)
-
+ 
                         if not tz:
                             for c in name:
                                 # name is not a tzstr unless it has at least
@@ -1680,86 +1680,86 @@ gettz = __get_gettz()
 del __get_gettz
 
 
-def datetime_exists(dt, tz=None):
-    """
-    Given a datetime and a time zone, determine whether or not a given datetime
-    would fall in a gap.
-
-    :param dt:
-        A :class:`datetime.datetime` (whose time zone will be ignored if ``tz``
-        is provided.)
-
-    :param tz:
-        A :class:`datetime.tzinfo` with support for the ``fold`` attribute. If
-        ``None`` or not provided, the datetime's own time zone will be used.
-
-    :return:
+def datetime_exists(dt, tz=None): 
+    """ 
+    Given a datetime and a time zone, determine whether or not a given datetime 
+    would fall in a gap. 
+ 
+    :param dt: 
+        A :class:`datetime.datetime` (whose time zone will be ignored if ``tz`` 
+        is provided.) 
+ 
+    :param tz: 
+        A :class:`datetime.tzinfo` with support for the ``fold`` attribute. If 
+        ``None`` or not provided, the datetime's own time zone will be used. 
+ 
+    :return: 
         Returns a boolean value whether or not the "wall time" exists in
         ``tz``.
 
     .. versionadded:: 2.7.0
-    """
-    if tz is None:
-        if dt.tzinfo is None:
-            raise ValueError('Datetime is naive and no time zone provided.')
-        tz = dt.tzinfo
-
-    dt = dt.replace(tzinfo=None)
-
-    # This is essentially a test of whether or not the datetime can survive
-    # a round trip to UTC.
+    """ 
+    if tz is None: 
+        if dt.tzinfo is None: 
+            raise ValueError('Datetime is naive and no time zone provided.') 
+        tz = dt.tzinfo 
+ 
+    dt = dt.replace(tzinfo=None) 
+ 
+    # This is essentially a test of whether or not the datetime can survive 
+    # a round trip to UTC. 
     dt_rt = dt.replace(tzinfo=tz).astimezone(UTC).astimezone(tz)
-    dt_rt = dt_rt.replace(tzinfo=None)
-
-    return dt == dt_rt
-
-
-def datetime_ambiguous(dt, tz=None):
-    """
-    Given a datetime and a time zone, determine whether or not a given datetime
-    is ambiguous (i.e if there are two times differentiated only by their DST
-    status).
-
-    :param dt:
-        A :class:`datetime.datetime` (whose time zone will be ignored if ``tz``
-        is provided.)
-
-    :param tz:
-        A :class:`datetime.tzinfo` with support for the ``fold`` attribute. If
-        ``None`` or not provided, the datetime's own time zone will be used.
-
-    :return:
-        Returns a boolean value whether or not the "wall time" is ambiguous in
-        ``tz``.
-
-    .. versionadded:: 2.6.0
-    """
-    if tz is None:
-        if dt.tzinfo is None:
-            raise ValueError('Datetime is naive and no time zone provided.')
-
-        tz = dt.tzinfo
-
-    # If a time zone defines its own "is_ambiguous" function, we'll use that.
-    is_ambiguous_fn = getattr(tz, 'is_ambiguous', None)
-    if is_ambiguous_fn is not None:
-        try:
-            return tz.is_ambiguous(dt)
+    dt_rt = dt_rt.replace(tzinfo=None) 
+ 
+    return dt == dt_rt 
+ 
+ 
+def datetime_ambiguous(dt, tz=None): 
+    """ 
+    Given a datetime and a time zone, determine whether or not a given datetime 
+    is ambiguous (i.e if there are two times differentiated only by their DST 
+    status). 
+ 
+    :param dt: 
+        A :class:`datetime.datetime` (whose time zone will be ignored if ``tz`` 
+        is provided.) 
+ 
+    :param tz: 
+        A :class:`datetime.tzinfo` with support for the ``fold`` attribute. If 
+        ``None`` or not provided, the datetime's own time zone will be used. 
+ 
+    :return: 
+        Returns a boolean value whether or not the "wall time" is ambiguous in 
+        ``tz``. 
+ 
+    .. versionadded:: 2.6.0 
+    """ 
+    if tz is None: 
+        if dt.tzinfo is None: 
+            raise ValueError('Datetime is naive and no time zone provided.') 
+ 
+        tz = dt.tzinfo 
+ 
+    # If a time zone defines its own "is_ambiguous" function, we'll use that. 
+    is_ambiguous_fn = getattr(tz, 'is_ambiguous', None) 
+    if is_ambiguous_fn is not None: 
+        try: 
+            return tz.is_ambiguous(dt) 
         except Exception:
-            pass
-
-    # If it doesn't come out and tell us it's ambiguous, we'll just check if
-    # the fold attribute has any effect on this particular date and time.
-    dt = dt.replace(tzinfo=tz)
-    wall_0 = enfold(dt, fold=0)
-    wall_1 = enfold(dt, fold=1)
-
-    same_offset = wall_0.utcoffset() == wall_1.utcoffset()
-    same_dst = wall_0.dst() == wall_1.dst()
-
-    return not (same_offset and same_dst)
-
-
+            pass 
+ 
+    # If it doesn't come out and tell us it's ambiguous, we'll just check if 
+    # the fold attribute has any effect on this particular date and time. 
+    dt = dt.replace(tzinfo=tz) 
+    wall_0 = enfold(dt, fold=0) 
+    wall_1 = enfold(dt, fold=1) 
+ 
+    same_offset = wall_0.utcoffset() == wall_1.utcoffset() 
+    same_dst = wall_0.dst() == wall_1.dst() 
+ 
+    return not (same_offset and same_dst) 
+ 
+ 
 def resolve_imaginary(dt):
     """
     Given a datetime that may be imaginary, return an existing datetime.
@@ -1806,14 +1806,14 @@ def resolve_imaginary(dt):
     return dt
 
 
-def _datetime_to_timestamp(dt):
-    """
+def _datetime_to_timestamp(dt): 
+    """ 
     Convert a :class:`datetime.datetime` object to an epoch timestamp in
     seconds since January 1, 1970, ignoring the time zone.
-    """
+    """ 
     return (dt.replace(tzinfo=None) - EPOCH).total_seconds()
-
-
+ 
+ 
 if sys.version_info >= (3, 6):
     def _get_supported_offset(second_offset):
         return second_offset
@@ -1826,8 +1826,8 @@ else:
         old_offset = second_offset
         calculated_offset = 60 * ((second_offset + 30) // 60)
         return calculated_offset
-
-
+ 
+ 
 try:
     # Python 3.7 feature
     from contextlib import nullcontext as _nullcontext
@@ -1839,11 +1839,11 @@ except ImportError:
         """
         def __init__(self, context):
             self.context = context
-
+ 
         def __enter__(self):
             return self.context
 
         def __exit__(*args, **kwargs):
             pass
 
-# vim:ts=4:sw=4:et
+# vim:ts=4:sw=4:et 
diff --git a/contrib/python/dateutil/dateutil/tz/win.py b/contrib/python/dateutil/dateutil/tz/win.py
index cde07ba792..49bac34400 100644
--- a/contrib/python/dateutil/dateutil/tz/win.py
+++ b/contrib/python/dateutil/dateutil/tz/win.py
@@ -6,203 +6,203 @@ including :py:class:`datetime.tzinfo` implementations.
 Attempting to import this module on a non-Windows platform will raise an
 :py:obj:`ImportError`.
 """
-# This code was originally contributed by Jeffrey Harris.
-import datetime
-import struct
-
-from six.moves import winreg
-from six import text_type
-
-try:
-    import ctypes
-    from ctypes import wintypes
-except ValueError:
-    # ValueError is raised on non-Windows systems for some horrible reason.
-    raise ImportError("Running tzwin on non-Windows system")
-
-from ._common import tzrangebase
-
-__all__ = ["tzwin", "tzwinlocal", "tzres"]
-
-ONEWEEK = datetime.timedelta(7)
-
-TZKEYNAMENT = r"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"
-TZKEYNAME9X = r"SOFTWARE\Microsoft\Windows\CurrentVersion\Time Zones"
-TZLOCALKEYNAME = r"SYSTEM\CurrentControlSet\Control\TimeZoneInformation"
-
-
-def _settzkeyname():
-    handle = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
-    try:
-        winreg.OpenKey(handle, TZKEYNAMENT).Close()
-        TZKEYNAME = TZKEYNAMENT
-    except WindowsError:
-        TZKEYNAME = TZKEYNAME9X
-    handle.Close()
-    return TZKEYNAME
-
-
-TZKEYNAME = _settzkeyname()
-
-
-class tzres(object):
-    """
+# This code was originally contributed by Jeffrey Harris. 
+import datetime 
+import struct 
+ 
+from six.moves import winreg 
+from six import text_type 
+ 
+try: 
+    import ctypes 
+    from ctypes import wintypes 
+except ValueError: 
+    # ValueError is raised on non-Windows systems for some horrible reason. 
+    raise ImportError("Running tzwin on non-Windows system") 
+ 
+from ._common import tzrangebase 
+ 
+__all__ = ["tzwin", "tzwinlocal", "tzres"] 
+ 
+ONEWEEK = datetime.timedelta(7) 
+ 
+TZKEYNAMENT = r"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones" 
+TZKEYNAME9X = r"SOFTWARE\Microsoft\Windows\CurrentVersion\Time Zones" 
+TZLOCALKEYNAME = r"SYSTEM\CurrentControlSet\Control\TimeZoneInformation" 
+ 
+ 
+def _settzkeyname(): 
+    handle = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) 
+    try: 
+        winreg.OpenKey(handle, TZKEYNAMENT).Close() 
+        TZKEYNAME = TZKEYNAMENT 
+    except WindowsError: 
+        TZKEYNAME = TZKEYNAME9X 
+    handle.Close() 
+    return TZKEYNAME 
+ 
+ 
+TZKEYNAME = _settzkeyname() 
+ 
+ 
+class tzres(object): 
+    """ 
     Class for accessing ``tzres.dll``, which contains timezone name related
-    resources.
-
-    .. versionadded:: 2.5.0
-    """
-    p_wchar = ctypes.POINTER(wintypes.WCHAR)        # Pointer to a wide char
-
-    def __init__(self, tzres_loc='tzres.dll'):
-        # Load the user32 DLL so we can load strings from tzres
-        user32 = ctypes.WinDLL('user32')
-
-        # Specify the LoadStringW function
-        user32.LoadStringW.argtypes = (wintypes.HINSTANCE,
-                                       wintypes.UINT,
-                                       wintypes.LPWSTR,
-                                       ctypes.c_int)
-
-        self.LoadStringW = user32.LoadStringW
-        self._tzres = ctypes.WinDLL(tzres_loc)
-        self.tzres_loc = tzres_loc
-
-    def load_name(self, offset):
-        """
-        Load a timezone name from a DLL offset (integer).
-
-        >>> from dateutil.tzwin import tzres
-        >>> tzr = tzres()
-        >>> print(tzr.load_name(112))
-        'Eastern Standard Time'
-
-        :param offset:
-            A positive integer value referring to a string from the tzres dll.
-
+    resources. 
+ 
+    .. versionadded:: 2.5.0 
+    """ 
+    p_wchar = ctypes.POINTER(wintypes.WCHAR)        # Pointer to a wide char 
+ 
+    def __init__(self, tzres_loc='tzres.dll'): 
+        # Load the user32 DLL so we can load strings from tzres 
+        user32 = ctypes.WinDLL('user32') 
+ 
+        # Specify the LoadStringW function 
+        user32.LoadStringW.argtypes = (wintypes.HINSTANCE, 
+                                       wintypes.UINT, 
+                                       wintypes.LPWSTR, 
+                                       ctypes.c_int) 
+ 
+        self.LoadStringW = user32.LoadStringW 
+        self._tzres = ctypes.WinDLL(tzres_loc) 
+        self.tzres_loc = tzres_loc 
+ 
+    def load_name(self, offset): 
+        """ 
+        Load a timezone name from a DLL offset (integer). 
+ 
+        >>> from dateutil.tzwin import tzres 
+        >>> tzr = tzres() 
+        >>> print(tzr.load_name(112)) 
+        'Eastern Standard Time' 
+ 
+        :param offset: 
+            A positive integer value referring to a string from the tzres dll. 
+ 
         .. note::
 
-            Offsets found in the registry are generally of the form
+            Offsets found in the registry are generally of the form 
             ``@tzres.dll,-114``. The offset in this case is 114, not -114.
-
-        """
-        resource = self.p_wchar()
-        lpBuffer = ctypes.cast(ctypes.byref(resource), wintypes.LPWSTR)
-        nchar = self.LoadStringW(self._tzres._handle, offset, lpBuffer, 0)
-        return resource[:nchar]
-
-    def name_from_string(self, tzname_str):
-        """
-        Parse strings as returned from the Windows registry into the time zone
-        name as defined in the registry.
-
-        >>> from dateutil.tzwin import tzres
-        >>> tzr = tzres()
-        >>> print(tzr.name_from_string('@tzres.dll,-251'))
-        'Dateline Daylight Time'
-        >>> print(tzr.name_from_string('Eastern Standard Time'))
-        'Eastern Standard Time'
-
-        :param tzname_str:
-            A timezone name string as returned from a Windows registry key.
-
-        :return:
-            Returns the localized timezone string from tzres.dll if the string
-            is of the form `@tzres.dll,-offset`, else returns the input string.
-        """
-        if not tzname_str.startswith('@'):
-            return tzname_str
-
-        name_splt = tzname_str.split(',-')
-        try:
-            offset = int(name_splt[1])
-        except:
-            raise ValueError("Malformed timezone string.")
-
-        return self.load_name(offset)
-
-
-class tzwinbase(tzrangebase):
-    """tzinfo class based on win32's timezones available in the registry."""
-    def __init__(self):
-        raise NotImplementedError('tzwinbase is an abstract base class')
-
-    def __eq__(self, other):
-        # Compare on all relevant dimensions, including name.
-        if not isinstance(other, tzwinbase):
-            return NotImplemented
-
-        return  (self._std_offset == other._std_offset and
-                 self._dst_offset == other._dst_offset and
-                 self._stddayofweek == other._stddayofweek and
-                 self._dstdayofweek == other._dstdayofweek and
-                 self._stdweeknumber == other._stdweeknumber and
-                 self._dstweeknumber == other._dstweeknumber and
-                 self._stdhour == other._stdhour and
-                 self._dsthour == other._dsthour and
-                 self._stdminute == other._stdminute and
-                 self._dstminute == other._dstminute and
-                 self._std_abbr == other._std_abbr and
-                 self._dst_abbr == other._dst_abbr)
-
-    @staticmethod
-    def list():
-        """Return a list of all time zones known to the system."""
-        with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle:
-            with winreg.OpenKey(handle, TZKEYNAME) as tzkey:
-                result = [winreg.EnumKey(tzkey, i)
-                          for i in range(winreg.QueryInfoKey(tzkey)[0])]
-        return result
-
-    def display(self):
+ 
+        """ 
+        resource = self.p_wchar() 
+        lpBuffer = ctypes.cast(ctypes.byref(resource), wintypes.LPWSTR) 
+        nchar = self.LoadStringW(self._tzres._handle, offset, lpBuffer, 0) 
+        return resource[:nchar] 
+ 
+    def name_from_string(self, tzname_str): 
+        """ 
+        Parse strings as returned from the Windows registry into the time zone 
+        name as defined in the registry. 
+ 
+        >>> from dateutil.tzwin import tzres 
+        >>> tzr = tzres() 
+        >>> print(tzr.name_from_string('@tzres.dll,-251')) 
+        'Dateline Daylight Time' 
+        >>> print(tzr.name_from_string('Eastern Standard Time')) 
+        'Eastern Standard Time' 
+ 
+        :param tzname_str: 
+            A timezone name string as returned from a Windows registry key. 
+ 
+        :return: 
+            Returns the localized timezone string from tzres.dll if the string 
+            is of the form `@tzres.dll,-offset`, else returns the input string. 
+        """ 
+        if not tzname_str.startswith('@'): 
+            return tzname_str 
+ 
+        name_splt = tzname_str.split(',-') 
+        try: 
+            offset = int(name_splt[1]) 
+        except: 
+            raise ValueError("Malformed timezone string.") 
+ 
+        return self.load_name(offset) 
+ 
+ 
+class tzwinbase(tzrangebase): 
+    """tzinfo class based on win32's timezones available in the registry.""" 
+    def __init__(self): 
+        raise NotImplementedError('tzwinbase is an abstract base class') 
+ 
+    def __eq__(self, other): 
+        # Compare on all relevant dimensions, including name. 
+        if not isinstance(other, tzwinbase): 
+            return NotImplemented 
+ 
+        return  (self._std_offset == other._std_offset and 
+                 self._dst_offset == other._dst_offset and 
+                 self._stddayofweek == other._stddayofweek and 
+                 self._dstdayofweek == other._dstdayofweek and 
+                 self._stdweeknumber == other._stdweeknumber and 
+                 self._dstweeknumber == other._dstweeknumber and 
+                 self._stdhour == other._stdhour and 
+                 self._dsthour == other._dsthour and 
+                 self._stdminute == other._stdminute and 
+                 self._dstminute == other._dstminute and 
+                 self._std_abbr == other._std_abbr and 
+                 self._dst_abbr == other._dst_abbr) 
+ 
+    @staticmethod 
+    def list(): 
+        """Return a list of all time zones known to the system.""" 
+        with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle: 
+            with winreg.OpenKey(handle, TZKEYNAME) as tzkey: 
+                result = [winreg.EnumKey(tzkey, i) 
+                          for i in range(winreg.QueryInfoKey(tzkey)[0])] 
+        return result 
+ 
+    def display(self): 
         """
         Return the display name of the time zone.
         """
-        return self._display
-
-    def transitions(self, year):
-        """
-        For a given year, get the DST on and off transition times, expressed
-        always on the standard time side. For zones with no transitions, this
-        function returns ``None``.
-
-        :param year:
-            The year whose transitions you would like to query.
-
-        :return:
-            Returns a :class:`tuple` of :class:`datetime.datetime` objects,
-            ``(dston, dstoff)`` for zones with an annual DST transition, or
-            ``None`` for fixed offset zones.
-        """
-
-        if not self.hasdst:
-            return None
-
-        dston = picknthweekday(year, self._dstmonth, self._dstdayofweek,
-                               self._dsthour, self._dstminute,
-                               self._dstweeknumber)
-
-        dstoff = picknthweekday(year, self._stdmonth, self._stddayofweek,
-                                self._stdhour, self._stdminute,
-                                self._stdweeknumber)
-
-        # Ambiguous dates default to the STD side
-        dstoff -= self._dst_base_offset
-
-        return dston, dstoff
-
-    def _get_hasdst(self):
-        return self._dstmonth != 0
-
-    @property
-    def _dst_base_offset(self):
-        return self._dst_base_offset_
-
-
-class tzwin(tzwinbase):
+        return self._display 
+ 
+    def transitions(self, year): 
+        """ 
+        For a given year, get the DST on and off transition times, expressed 
+        always on the standard time side. For zones with no transitions, this 
+        function returns ``None``. 
+ 
+        :param year: 
+            The year whose transitions you would like to query. 
+ 
+        :return: 
+            Returns a :class:`tuple` of :class:`datetime.datetime` objects, 
+            ``(dston, dstoff)`` for zones with an annual DST transition, or 
+            ``None`` for fixed offset zones. 
+        """ 
+ 
+        if not self.hasdst: 
+            return None 
+ 
+        dston = picknthweekday(year, self._dstmonth, self._dstdayofweek, 
+                               self._dsthour, self._dstminute, 
+                               self._dstweeknumber) 
+ 
+        dstoff = picknthweekday(year, self._stdmonth, self._stddayofweek, 
+                                self._stdhour, self._stdminute, 
+                                self._stdweeknumber) 
+ 
+        # Ambiguous dates default to the STD side 
+        dstoff -= self._dst_base_offset 
+ 
+        return dston, dstoff 
+ 
+    def _get_hasdst(self): 
+        return self._dstmonth != 0 
+ 
+    @property 
+    def _dst_base_offset(self): 
+        return self._dst_base_offset_ 
+ 
+ 
+class tzwin(tzwinbase): 
     """
     Time zone object created from the zone info in the Windows registry
-
+ 
     These are similar to :py:class:`dateutil.tz.tzrange` objects in that
     the time zone data is provided in the format of a single offset rule
     for either 0 or 2 time zone transitions per year.
@@ -212,51 +212,51 @@ class tzwin(tzwinbase):
         The full list of keys can be retrieved with :func:`tzwin.list`.
     """
 
-    def __init__(self, name):
-        self._name = name
-
-        with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle:
-            tzkeyname = text_type("{kn}\\{name}").format(kn=TZKEYNAME, name=name)
-            with winreg.OpenKey(handle, tzkeyname) as tzkey:
-                keydict = valuestodict(tzkey)
-
-        self._std_abbr = keydict["Std"]
-        self._dst_abbr = keydict["Dlt"]
-
-        self._display = keydict["Display"]
-
-        # See http://ww_winreg.jsiinc.com/SUBA/tip0300/rh0398.htm
-        tup = struct.unpack("=3l16h", keydict["TZI"])
-        stdoffset = -tup[0]-tup[1]          # Bias + StandardBias * -1
-        dstoffset = stdoffset-tup[2]        # + DaylightBias * -1
-        self._std_offset = datetime.timedelta(minutes=stdoffset)
-        self._dst_offset = datetime.timedelta(minutes=dstoffset)
-
-        # for the meaning see the win32 TIME_ZONE_INFORMATION structure docs
-        # http://msdn.microsoft.com/en-us/library/windows/desktop/ms725481(v=vs.85).aspx
-        (self._stdmonth,
-         self._stddayofweek,   # Sunday = 0
-         self._stdweeknumber,  # Last = 5
-         self._stdhour,
-         self._stdminute) = tup[4:9]
-
-        (self._dstmonth,
-         self._dstdayofweek,   # Sunday = 0
-         self._dstweeknumber,  # Last = 5
-         self._dsthour,
-         self._dstminute) = tup[12:17]
-
-        self._dst_base_offset_ = self._dst_offset - self._std_offset
-        self.hasdst = self._get_hasdst()
-
-    def __repr__(self):
-        return "tzwin(%s)" % repr(self._name)
-
-    def __reduce__(self):
-        return (self.__class__, (self._name,))
-
-
-class tzwinlocal(tzwinbase):
+    def __init__(self, name): 
+        self._name = name 
+ 
+        with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle: 
+            tzkeyname = text_type("{kn}\\{name}").format(kn=TZKEYNAME, name=name) 
+            with winreg.OpenKey(handle, tzkeyname) as tzkey: 
+                keydict = valuestodict(tzkey) 
+ 
+        self._std_abbr = keydict["Std"] 
+        self._dst_abbr = keydict["Dlt"] 
+ 
+        self._display = keydict["Display"] 
+ 
+        # See http://ww_winreg.jsiinc.com/SUBA/tip0300/rh0398.htm 
+        tup = struct.unpack("=3l16h", keydict["TZI"]) 
+        stdoffset = -tup[0]-tup[1]          # Bias + StandardBias * -1 
+        dstoffset = stdoffset-tup[2]        # + DaylightBias * -1 
+        self._std_offset = datetime.timedelta(minutes=stdoffset) 
+        self._dst_offset = datetime.timedelta(minutes=dstoffset) 
+ 
+        # for the meaning see the win32 TIME_ZONE_INFORMATION structure docs 
+        # http://msdn.microsoft.com/en-us/library/windows/desktop/ms725481(v=vs.85).aspx 
+        (self._stdmonth, 
+         self._stddayofweek,   # Sunday = 0 
+         self._stdweeknumber,  # Last = 5 
+         self._stdhour, 
+         self._stdminute) = tup[4:9] 
+ 
+        (self._dstmonth, 
+         self._dstdayofweek,   # Sunday = 0 
+         self._dstweeknumber,  # Last = 5 
+         self._dsthour, 
+         self._dstminute) = tup[12:17] 
+ 
+        self._dst_base_offset_ = self._dst_offset - self._std_offset 
+        self.hasdst = self._get_hasdst() 
+ 
+    def __repr__(self): 
+        return "tzwin(%s)" % repr(self._name) 
+ 
+    def __reduce__(self): 
+        return (self.__class__, (self._name,)) 
+ 
+ 
+class tzwinlocal(tzwinbase): 
     """
     Class representing the local time zone information in the Windows registry
 
@@ -273,98 +273,98 @@ class tzwinlocal(tzwinbase):
     Because ``tzwinlocal`` reads the registry directly, it is unaffected by
     this issue.
     """
-    def __init__(self):
-        with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle:
-            with winreg.OpenKey(handle, TZLOCALKEYNAME) as tzlocalkey:
-                keydict = valuestodict(tzlocalkey)
-
-            self._std_abbr = keydict["StandardName"]
-            self._dst_abbr = keydict["DaylightName"]
-
-            try:
-                tzkeyname = text_type('{kn}\\{sn}').format(kn=TZKEYNAME,
-                                                          sn=self._std_abbr)
-                with winreg.OpenKey(handle, tzkeyname) as tzkey:
-                    _keydict = valuestodict(tzkey)
-                    self._display = _keydict["Display"]
-            except OSError:
-                self._display = None
-
-        stdoffset = -keydict["Bias"]-keydict["StandardBias"]
-        dstoffset = stdoffset-keydict["DaylightBias"]
-
-        self._std_offset = datetime.timedelta(minutes=stdoffset)
-        self._dst_offset = datetime.timedelta(minutes=dstoffset)
-
-        # For reasons unclear, in this particular key, the day of week has been
-        # moved to the END of the SYSTEMTIME structure.
-        tup = struct.unpack("=8h", keydict["StandardStart"])
-
-        (self._stdmonth,
-         self._stdweeknumber,  # Last = 5
-         self._stdhour,
-         self._stdminute) = tup[1:5]
-
-        self._stddayofweek = tup[7]
-
-        tup = struct.unpack("=8h", keydict["DaylightStart"])
-
-        (self._dstmonth,
-         self._dstweeknumber,  # Last = 5
-         self._dsthour,
-         self._dstminute) = tup[1:5]
-
-        self._dstdayofweek = tup[7]
-
-        self._dst_base_offset_ = self._dst_offset - self._std_offset
-        self.hasdst = self._get_hasdst()
-
-    def __repr__(self):
-        return "tzwinlocal()"
-
-    def __str__(self):
-        # str will return the standard name, not the daylight name.
-        return "tzwinlocal(%s)" % repr(self._std_abbr)
-
-    def __reduce__(self):
-        return (self.__class__, ())
-
-
-def picknthweekday(year, month, dayofweek, hour, minute, whichweek):
-    """ dayofweek == 0 means Sunday, whichweek 5 means last instance """
-    first = datetime.datetime(year, month, 1, hour, minute)
-
-    # This will work if dayofweek is ISO weekday (1-7) or Microsoft-style (0-6),
-    # Because 7 % 7 = 0
-    weekdayone = first.replace(day=((dayofweek - first.isoweekday()) % 7) + 1)
-    wd = weekdayone + ((whichweek - 1) * ONEWEEK)
-    if (wd.month != month):
-        wd -= ONEWEEK
-
-    return wd
-
-
-def valuestodict(key):
-    """Convert a registry key's values to a dictionary."""
-    dout = {}
-    size = winreg.QueryInfoKey(key)[1]
-    tz_res = None
-
-    for i in range(size):
-        key_name, value, dtype = winreg.EnumValue(key, i)
-        if dtype == winreg.REG_DWORD or dtype == winreg.REG_DWORD_LITTLE_ENDIAN:
-            # If it's a DWORD (32-bit integer), it's stored as unsigned - convert
-            # that to a proper signed integer
-            if value & (1 << 31):
-                value = value - (1 << 32)
-        elif dtype == winreg.REG_SZ:
-            # If it's a reference to the tzres DLL, load the actual string
-            if value.startswith('@tzres'):
-                tz_res = tz_res or tzres()
-                value = tz_res.name_from_string(value)
-
-            value = value.rstrip('\x00')    # Remove trailing nulls
-
-        dout[key_name] = value
-
-    return dout
+    def __init__(self): 
+        with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle: 
+            with winreg.OpenKey(handle, TZLOCALKEYNAME) as tzlocalkey: 
+                keydict = valuestodict(tzlocalkey) 
+ 
+            self._std_abbr = keydict["StandardName"] 
+            self._dst_abbr = keydict["DaylightName"] 
+ 
+            try: 
+                tzkeyname = text_type('{kn}\\{sn}').format(kn=TZKEYNAME, 
+                                                          sn=self._std_abbr) 
+                with winreg.OpenKey(handle, tzkeyname) as tzkey: 
+                    _keydict = valuestodict(tzkey) 
+                    self._display = _keydict["Display"] 
+            except OSError: 
+                self._display = None 
+ 
+        stdoffset = -keydict["Bias"]-keydict["StandardBias"] 
+        dstoffset = stdoffset-keydict["DaylightBias"] 
+ 
+        self._std_offset = datetime.timedelta(minutes=stdoffset) 
+        self._dst_offset = datetime.timedelta(minutes=dstoffset) 
+ 
+        # For reasons unclear, in this particular key, the day of week has been 
+        # moved to the END of the SYSTEMTIME structure. 
+        tup = struct.unpack("=8h", keydict["StandardStart"]) 
+ 
+        (self._stdmonth, 
+         self._stdweeknumber,  # Last = 5 
+         self._stdhour, 
+         self._stdminute) = tup[1:5] 
+ 
+        self._stddayofweek = tup[7] 
+ 
+        tup = struct.unpack("=8h", keydict["DaylightStart"]) 
+ 
+        (self._dstmonth, 
+         self._dstweeknumber,  # Last = 5 
+         self._dsthour, 
+         self._dstminute) = tup[1:5] 
+ 
+        self._dstdayofweek = tup[7] 
+ 
+        self._dst_base_offset_ = self._dst_offset - self._std_offset 
+        self.hasdst = self._get_hasdst() 
+ 
+    def __repr__(self): 
+        return "tzwinlocal()" 
+ 
+    def __str__(self): 
+        # str will return the standard name, not the daylight name. 
+        return "tzwinlocal(%s)" % repr(self._std_abbr) 
+ 
+    def __reduce__(self): 
+        return (self.__class__, ()) 
+ 
+ 
+def picknthweekday(year, month, dayofweek, hour, minute, whichweek): 
+    """ dayofweek == 0 means Sunday, whichweek 5 means last instance """ 
+    first = datetime.datetime(year, month, 1, hour, minute) 
+ 
+    # This will work if dayofweek is ISO weekday (1-7) or Microsoft-style (0-6), 
+    # Because 7 % 7 = 0 
+    weekdayone = first.replace(day=((dayofweek - first.isoweekday()) % 7) + 1) 
+    wd = weekdayone + ((whichweek - 1) * ONEWEEK) 
+    if (wd.month != month): 
+        wd -= ONEWEEK 
+ 
+    return wd 
+ 
+ 
+def valuestodict(key): 
+    """Convert a registry key's values to a dictionary.""" 
+    dout = {} 
+    size = winreg.QueryInfoKey(key)[1] 
+    tz_res = None 
+ 
+    for i in range(size): 
+        key_name, value, dtype = winreg.EnumValue(key, i) 
+        if dtype == winreg.REG_DWORD or dtype == winreg.REG_DWORD_LITTLE_ENDIAN: 
+            # If it's a DWORD (32-bit integer), it's stored as unsigned - convert 
+            # that to a proper signed integer 
+            if value & (1 << 31): 
+                value = value - (1 << 32) 
+        elif dtype == winreg.REG_SZ: 
+            # If it's a reference to the tzres DLL, load the actual string 
+            if value.startswith('@tzres'): 
+                tz_res = tz_res or tzres() 
+                value = tz_res.name_from_string(value) 
+ 
+            value = value.rstrip('\x00')    # Remove trailing nulls 
+ 
+        dout[key_name] = value 
+ 
+    return dout 
diff --git a/contrib/python/dateutil/dateutil/tzwin.py b/contrib/python/dateutil/dateutil/tzwin.py
index cebc673e40..8f9d27c5ff 100644
--- a/contrib/python/dateutil/dateutil/tzwin.py
+++ b/contrib/python/dateutil/dateutil/tzwin.py
@@ -1,2 +1,2 @@
-# tzwin has moved to dateutil.tz.win
-from .tz.win import *
+# tzwin has moved to dateutil.tz.win 
+from .tz.win import * 
diff --git a/contrib/python/dateutil/dateutil/zoneinfo/__init__.py b/contrib/python/dateutil/dateutil/zoneinfo/__init__.py
index 34f11ad66c..7261df794a 100644
--- a/contrib/python/dateutil/dateutil/zoneinfo/__init__.py
+++ b/contrib/python/dateutil/dateutil/zoneinfo/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import warnings
-import json
-
+import json 
+ 
 from tarfile import TarFile
 from pkgutil import get_data
 from io import BytesIO
@@ -10,8 +10,8 @@ from dateutil.tz import tzfile as _tzfile
 
 __all__ = ["get_zonefile_instance", "gettz", "gettz_db_metadata"]
 
-ZONEFILENAME = "dateutil-zoneinfo.tar.gz"
-METADATA_FN = 'METADATA'
+ZONEFILENAME = "dateutil-zoneinfo.tar.gz" 
+METADATA_FN = 'METADATA' 
 
 
 class tzfile(_tzfile):
@@ -40,128 +40,128 @@ class ZoneInfoFile(object):
                          for zl in tf.getmembers() if
                          zl.islnk() or zl.issym()}
                 self.zones.update(links)
-                try:
-                    metadata_json = tf.extractfile(tf.getmember(METADATA_FN))
-                    metadata_str = metadata_json.read().decode('UTF-8')
-                    self.metadata = json.loads(metadata_str)
-                except KeyError:
-                    # no metadata in tar file
-                    self.metadata = None
+                try: 
+                    metadata_json = tf.extractfile(tf.getmember(METADATA_FN)) 
+                    metadata_str = metadata_json.read().decode('UTF-8') 
+                    self.metadata = json.loads(metadata_str) 
+                except KeyError: 
+                    # no metadata in tar file 
+                    self.metadata = None 
         else:
             self.zones = {}
-            self.metadata = None
-
-    def get(self, name, default=None):
-        """
-        Wrapper for :func:`ZoneInfoFile.zones.get`. This is a convenience method
-        for retrieving zones from the zone dictionary.
-
-        :param name:
-            The name of the zone to retrieve. (Generally IANA zone names)
-
-        :param default:
-            The value to return in the event of a missing key.
-
-        .. versionadded:: 2.6.0
-
-        """
-        return self.zones.get(name, default)
-
-
+            self.metadata = None 
+
+    def get(self, name, default=None): 
+        """ 
+        Wrapper for :func:`ZoneInfoFile.zones.get`. This is a convenience method 
+        for retrieving zones from the zone dictionary. 
+
+        :param name: 
+            The name of the zone to retrieve. (Generally IANA zone names) 
+ 
+        :param default: 
+            The value to return in the event of a missing key. 
+ 
+        .. versionadded:: 2.6.0 
+ 
+        """ 
+        return self.zones.get(name, default) 
+ 
+ 
 # The current API has gettz as a module function, although in fact it taps into
 # a stateful class. So as a workaround for now, without changing the API, we
 # will create a new "global" class instance the first time a user requests a
 # timezone. Ugly, but adheres to the api.
 #
-# TODO: Remove after deprecation period.
+# TODO: Remove after deprecation period. 
 _CLASS_ZONE_INSTANCE = []
 
 
-def get_zonefile_instance(new_instance=False):
-    """
-    This is a convenience function which provides a :class:`ZoneInfoFile`
-    instance using the data provided by the ``dateutil`` package. By default, it
-    caches a single instance of the ZoneInfoFile object and returns that.
-
-    :param new_instance:
-        If ``True``, a new instance of :class:`ZoneInfoFile` is instantiated and
-        used as the cached instance for the next call. Otherwise, new instances
-        are created only as necessary.
-
-    :return:
-        Returns a :class:`ZoneInfoFile` object.
-
-    .. versionadded:: 2.6
-    """
-    if new_instance:
-        zif = None
-    else:
-        zif = getattr(get_zonefile_instance, '_cached_instance', None)
-
-    if zif is None:
-        zif = ZoneInfoFile(getzoneinfofile_stream())
-
-        get_zonefile_instance._cached_instance = zif
-
-    return zif
-
-
+def get_zonefile_instance(new_instance=False): 
+    """ 
+    This is a convenience function which provides a :class:`ZoneInfoFile` 
+    instance using the data provided by the ``dateutil`` package. By default, it 
+    caches a single instance of the ZoneInfoFile object and returns that. 
+ 
+    :param new_instance: 
+        If ``True``, a new instance of :class:`ZoneInfoFile` is instantiated and 
+        used as the cached instance for the next call. Otherwise, new instances 
+        are created only as necessary. 
+ 
+    :return: 
+        Returns a :class:`ZoneInfoFile` object. 
+ 
+    .. versionadded:: 2.6 
+    """ 
+    if new_instance: 
+        zif = None 
+    else: 
+        zif = getattr(get_zonefile_instance, '_cached_instance', None) 
+ 
+    if zif is None: 
+        zif = ZoneInfoFile(getzoneinfofile_stream()) 
+ 
+        get_zonefile_instance._cached_instance = zif 
+ 
+    return zif 
+ 
+ 
 def gettz(name):
-    """
-    This retrieves a time zone from the local zoneinfo tarball that is packaged
-    with dateutil.
-
-    :param name:
-        An IANA-style time zone name, as found in the zoneinfo file.
-
-    :return:
-        Returns a :class:`dateutil.tz.tzfile` time zone object.
-
-    .. warning::
-        It is generally inadvisable to use this function, and it is only
-        provided for API compatibility with earlier versions. This is *not*
-        equivalent to ``dateutil.tz.gettz()``, which selects an appropriate
-        time zone based on the inputs, favoring system zoneinfo. This is ONLY
-        for accessing the dateutil-specific zoneinfo (which may be out of
-        date compared to the system zoneinfo).
-
-    .. deprecated:: 2.6
-        If you need to use a specific zoneinfofile over the system zoneinfo,
-        instantiate a :class:`dateutil.zoneinfo.ZoneInfoFile` object and call
-        :func:`dateutil.zoneinfo.ZoneInfoFile.get(name)` instead.
-
-        Use :func:`get_zonefile_instance` to retrieve an instance of the
-        dateutil-provided zoneinfo.
-    """
-    warnings.warn("zoneinfo.gettz() will be removed in future versions, "
-                  "to use the dateutil-provided zoneinfo files, instantiate a "
-                  "ZoneInfoFile object and use ZoneInfoFile.zones.get() "
-                  "instead. See the documentation for details.",
-                  DeprecationWarning)
-
+    """ 
+    This retrieves a time zone from the local zoneinfo tarball that is packaged 
+    with dateutil. 
+ 
+    :param name: 
+        An IANA-style time zone name, as found in the zoneinfo file. 
+ 
+    :return: 
+        Returns a :class:`dateutil.tz.tzfile` time zone object. 
+ 
+    .. warning:: 
+        It is generally inadvisable to use this function, and it is only 
+        provided for API compatibility with earlier versions. This is *not* 
+        equivalent to ``dateutil.tz.gettz()``, which selects an appropriate 
+        time zone based on the inputs, favoring system zoneinfo. This is ONLY 
+        for accessing the dateutil-specific zoneinfo (which may be out of 
+        date compared to the system zoneinfo). 
+ 
+    .. deprecated:: 2.6 
+        If you need to use a specific zoneinfofile over the system zoneinfo, 
+        instantiate a :class:`dateutil.zoneinfo.ZoneInfoFile` object and call 
+        :func:`dateutil.zoneinfo.ZoneInfoFile.get(name)` instead. 
+ 
+        Use :func:`get_zonefile_instance` to retrieve an instance of the 
+        dateutil-provided zoneinfo. 
+    """ 
+    warnings.warn("zoneinfo.gettz() will be removed in future versions, " 
+                  "to use the dateutil-provided zoneinfo files, instantiate a " 
+                  "ZoneInfoFile object and use ZoneInfoFile.zones.get() " 
+                  "instead. See the documentation for details.", 
+                  DeprecationWarning) 
+ 
     if len(_CLASS_ZONE_INSTANCE) == 0:
         _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
     return _CLASS_ZONE_INSTANCE[0].zones.get(name)
 
 
-def gettz_db_metadata():
-    """ Get the zonefile metadata
-
-    See `zonefile_metadata`_
+def gettz_db_metadata(): 
+    """ Get the zonefile metadata 
 
-    :returns:
-        A dictionary with the database metadata
+    See `zonefile_metadata`_ 
 
-    .. deprecated:: 2.6
-        See deprecation warning in :func:`zoneinfo.gettz`. To get metadata,
-        query the attribute ``zoneinfo.ZoneInfoFile.metadata``.
+    :returns: 
+        A dictionary with the database metadata 
+ 
+    .. deprecated:: 2.6 
+        See deprecation warning in :func:`zoneinfo.gettz`. To get metadata, 
+        query the attribute ``zoneinfo.ZoneInfoFile.metadata``. 
     """
-    warnings.warn("zoneinfo.gettz_db_metadata() will be removed in future "
-                  "versions, to use the dateutil-provided zoneinfo files, "
-                  "ZoneInfoFile object and query the 'metadata' attribute "
-                  "instead. See the documentation for details.",
-                  DeprecationWarning)
-
-    if len(_CLASS_ZONE_INSTANCE) == 0:
-        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
-    return _CLASS_ZONE_INSTANCE[0].metadata
+    warnings.warn("zoneinfo.gettz_db_metadata() will be removed in future " 
+                  "versions, to use the dateutil-provided zoneinfo files, " 
+                  "ZoneInfoFile object and query the 'metadata' attribute " 
+                  "instead. See the documentation for details.", 
+                  DeprecationWarning) 
+ 
+    if len(_CLASS_ZONE_INSTANCE) == 0: 
+        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream())) 
+    return _CLASS_ZONE_INSTANCE[0].metadata 
diff --git a/contrib/python/dateutil/dateutil/zoneinfo/rebuild.py b/contrib/python/dateutil/dateutil/zoneinfo/rebuild.py
index 684c6586f0..30c959498e 100644
--- a/contrib/python/dateutil/dateutil/zoneinfo/rebuild.py
+++ b/contrib/python/dateutil/dateutil/zoneinfo/rebuild.py
@@ -1,43 +1,43 @@
-import logging
-import os
-import tempfile
-import shutil
-import json
+import logging 
+import os 
+import tempfile 
+import shutil 
+import json 
 from subprocess import check_call, check_output
 from tarfile import TarFile
-
+ 
 from dateutil.zoneinfo import METADATA_FN, ZONEFILENAME
-
-
-def rebuild(filename, tag=None, format="gz", zonegroups=[], metadata=None):
-    """Rebuild the internal timezone info in dateutil/zoneinfo/zoneinfo*tar*
-
+ 
+ 
+def rebuild(filename, tag=None, format="gz", zonegroups=[], metadata=None): 
+    """Rebuild the internal timezone info in dateutil/zoneinfo/zoneinfo*tar* 
+ 
     filename is the timezone tarball from ``ftp.iana.org/tz``.
-
-    """
-    tmpdir = tempfile.mkdtemp()
-    zonedir = os.path.join(tmpdir, "zoneinfo")
-    moduledir = os.path.dirname(__file__)
-    try:
+ 
+    """ 
+    tmpdir = tempfile.mkdtemp() 
+    zonedir = os.path.join(tmpdir, "zoneinfo") 
+    moduledir = os.path.dirname(__file__) 
+    try: 
         with TarFile.open(filename) as tf:
-            for name in zonegroups:
-                tf.extract(name, tmpdir)
-            filepaths = [os.path.join(tmpdir, n) for n in zonegroups]
+            for name in zonegroups: 
+                tf.extract(name, tmpdir) 
+            filepaths = [os.path.join(tmpdir, n) for n in zonegroups] 
 
             _run_zic(zonedir, filepaths)
 
-        # write metadata file
-        with open(os.path.join(zonedir, METADATA_FN), 'w') as f:
-            json.dump(metadata, f, indent=4, sort_keys=True)
-        target = os.path.join(moduledir, ZONEFILENAME)
+        # write metadata file 
+        with open(os.path.join(zonedir, METADATA_FN), 'w') as f: 
+            json.dump(metadata, f, indent=4, sort_keys=True) 
+        target = os.path.join(moduledir, ZONEFILENAME) 
         with TarFile.open(target, "w:%s" % format) as tf:
-            for entry in os.listdir(zonedir):
-                entrypath = os.path.join(zonedir, entry)
-                tf.add(entrypath, entry)
-    finally:
-        shutil.rmtree(tmpdir)
-
-
+            for entry in os.listdir(zonedir): 
+                entrypath = os.path.join(zonedir, entry) 
+                tf.add(entrypath, entry) 
+    finally: 
+        shutil.rmtree(tmpdir) 
+ 
+ 
 def _run_zic(zonedir, filepaths):
     """Calls the ``zic`` compiler in a compatible way to get a "fat" binary.
 
@@ -62,14 +62,14 @@ def _run_zic(zonedir, filepaths):
     check_call(["zic"] + bloat_args + ["-d", zonedir] + filepaths)
 
 
-def _print_on_nosuchfile(e):
-    """Print helpful troubleshooting message
-
-    e is an exception raised by subprocess.check_call()
-
-    """
-    if e.errno == 2:
-        logging.error(
-            "Could not find zic. Perhaps you need to install "
-            "libc-bin or some other package that provides it, "
-            "or it's not in your PATH?")
+def _print_on_nosuchfile(e): 
+    """Print helpful troubleshooting message 
+ 
+    e is an exception raised by subprocess.check_call() 
+ 
+    """ 
+    if e.errno == 2: 
+        logging.error( 
+            "Could not find zic. Perhaps you need to install " 
+            "libc-bin or some other package that provides it, " 
+            "or it's not in your PATH?") 
diff --git a/contrib/python/dateutil/ya.make b/contrib/python/dateutil/ya.make
index 0c4102c505..53db48b2cf 100644
--- a/contrib/python/dateutil/ya.make
+++ b/contrib/python/dateutil/ya.make
@@ -22,7 +22,7 @@ NO_CHECK_IMPORTS(
 PY_SRCS(
     TOP_LEVEL
     dateutil/__init__.py
-    dateutil/_common.py
+    dateutil/_common.py 
     dateutil/_version.py
     dateutil/easter.py
     dateutil/parser/__init__.py
@@ -30,15 +30,15 @@ PY_SRCS(
     dateutil/parser/isoparser.py
     dateutil/relativedelta.py
     dateutil/rrule.py
-    dateutil/tz/__init__.py
-    dateutil/tz/_common.py
+    dateutil/tz/__init__.py 
+    dateutil/tz/_common.py 
     dateutil/tz/_factories.py
-    dateutil/tz/tz.py
-    dateutil/tz/win.py
+    dateutil/tz/tz.py 
+    dateutil/tz/win.py 
     dateutil/tzwin.py
     dateutil/utils.py
     dateutil/zoneinfo/__init__.py
-    dateutil/zoneinfo/rebuild.py
+    dateutil/zoneinfo/rebuild.py 
 )
 
 RESOURCE_FILES(