Fixes timezone behavior when passed to a datetime constructor.

Author: sdispater

pendulum/tz/timezone.py

@@ -175,7 +175,8 @@ def _normalize(self, dt, dst_rule=None):
                 unix_time = (dt - datetime(1970, 1, 1)).total_seconds() - offset
 
                 return self._to_local_time(
-                    unix_time, self._default_tzinfo_index
+                    unix_time, dt.microsecond, self._default_tzinfo_index,
+                    fold
                 )
             else:
                 # tr.pre_time < dt < tr.time
@@ -316,51 +317,60 @@ def _find_transition_index(self, dt, prop='_time'):
         return lo
 
     def _get_previous_transition_time(self, tr, dt):
+        """
+        Returns the time before the transition
+        as a (unix_time, tzinfo_index) tuple.
+
+        :param tr: The transition
+        :type tr: Transition
+
+        :param dt: The datetime
+        :type dt: datetime
+
+        :rtype: tuple
+        """
         diff = self._get_diff(tr.pre_time, dt)
         if -1 < diff < 0 and tr.unix_time < 0:
             diff -= 1
 
-        unix_time = tr.unix_time + diff
-
         tzinfo_index = tr.pre_tzinfo_index
 
+        unix_time = tr.unix_time + diff
+
         return unix_time, tzinfo_index
 
     def tzname(self, dt):
         if dt is None:
             return None
 
-        tzinfo = dt.tzinfo
-        if tzinfo is None or tzinfo.tz is not self:
+        if dt.tzinfo is self:
+            dt = self.convert(dt.replace(tzinfo=None))
+        else:
             dt = self.convert(dt)
 
-            return dt.tzinfo.abbrev
-
-        return dt.tzinfo.tzname(dt)
+        return dt.tzinfo.abbrev
 
     def utcoffset(self, dt):
         if dt is None:
             return None
 
-        tzinfo = dt.tzinfo
-        if tzinfo is None or tzinfo.tz is not self:
+        if dt.tzinfo is self:
+            dt = self.convert(dt.replace(tzinfo=None))
+        else:
             dt = self.convert(dt)
 
-            return dt.tzinfo.adjusted_offset
-
-        return dt.tzinfo.utcoffset(dt)
+        return dt.tzinfo.adjusted_offset
 
     def dst(self, dt):
         if dt is None:
             return None
 
-        tzinfo = dt.tzinfo
-        if tzinfo is None or tzinfo.tz is not self:
+        if dt.tzinfo is self:
+            dt = self.convert(dt.replace(tzinfo=None))
+        else:
             dt = self.convert(dt)
 
-            return dt.tzinfo.dst_
-
-        return dt.tzinfo.dst(dt)
+        return dt.tzinfo.dst_
 
     def fromutc(self, dt):
         dt = dt.replace(tzinfo=None)

tests/tz_tests/test_timezone.py

@@ -256,3 +256,15 @@ def test_tzname_fold_attribute_is_honored(self):
         name = tz.tzname(dt.replace(fold=1))
 
         self.assertEqual('EST', name)
+
+    def test_constructor_fold_attribute_is_honored(self):
+        self.skip_if_not_36()
+
+        tz = pendulum.timezone('US/Eastern')
+        dt = datetime(2014, 11, 2, 1, 30, tzinfo=tz)
+
+        self.assertEqual('-0400', dt.strftime('%z'))
+
+        dt = datetime(2014, 11, 2, 1, 30, tzinfo=tz, fold=1)
+
+        self.assertEqual('-0500', dt.strftime('%z'))