Fixes wrong behavior for fixed timezones.

Author: sdispater

pendulum/tz/timezone.py

@@ -348,21 +348,27 @@ def __init__(self, offset, name=None, transition_type=None):
         super(FixedTimezone, self).__init__(name, [], [], 0, (datetime(1970, 1, 1),))
 
         self._tzinfos = (TimezoneInfo(self, transition_type),)
+        self._tzinfo = self._tzinfos[0]
+
+    def _normalize(self, dt, dst_rule=Timezone.POST_TRANSITION):
+        return dt.replace(tzinfo=self._tzinfo)
 
     def utcoffset(self, dt):
         if dt is None:
             return None
 
-        return self._tzinfos[0].utcoffset(dt)
+        return self._tzinfo.utcoffset(dt)
 
     def dst(self, dt):
         if dt is None:
             return None
 
-        return self._tzinfos[0].dst(dt)
+        return self._tzinfo.dst(dt)
 
     def fromutc(self, dt):
-        return dt.replace(tzinfo=self._tzinfos[0])
+        dt = dt.replace(tzinfo=None)
+
+        return (dt + self._tzinfo.adjusted_offset).replace(tzinfo=self._tzinfo)
 
 
 class _UTC(FixedTimezone):

tests/pendulum_tests/test_add.py

@@ -2,6 +2,7 @@
 
 from .. import AbstractTestCase
 
+import pendulum
 from datetime import timedelta
 from pendulum import Pendulum
 
@@ -106,3 +107,11 @@ def test_addition_invalid_type(self):
             self.fail()
         except TypeError:
             pass
+
+    def test_add_to_fixed_timezones(self):
+        dt = pendulum.parse('2015-03-08T01:00:00-06:00')
+        dt = dt.add(weeks=1)
+
+        self.assertPendulum(dt, 2015, 3, 15, 1, 0, 0)
+        self.assertEqual('-06:00', dt.timezone_name)
+        self.assertEqual(-6 * 3600, dt.offset)