Fixes Timezone._convert() for fixed timezones.

Author: sdispater

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed `Timezone._convert()` method for fixed timezones.
+
+
 ## [0.6.0] - 2016-09-12
 
 ### Added
@@ -170,6 +177,7 @@ This version causes major breaking API changes to simplify it and making it more
 Initial release
 
 
+[Unreleased]: https://github.com/sdispater/pendulum/compare/0.6.0...master
 [0.6.0]: https://github.com/sdispater/pendulum/releases/tag/0.6.0
 [0.5.5]: https://github.com/sdispater/pendulum/releases/tag/0.5.5
 [0.5.4]: https://github.com/sdispater/pendulum/releases/tag/0.5.4

pendulum/pendulum.py

@@ -261,7 +261,7 @@ def now(cls, tz=None):
         Get a Pendulum instance for the current date and time.
 
         :param tz: The timezone
-        :type tz: Timezone or TimezoneInfo or str or None
+        :type tz: Timezone or TimezoneInfo or str or int or None
 
         :rtype: Pendulum
         """

pendulum/tz/timezone.py

@@ -323,12 +323,13 @@ def _find_utc_index(self, dt):
     def __repr__(self):
         return '<Timezone [{}]>'.format(self._name)
 
+
 class FixedTimezone(Timezone):
     """
     A timezone that has a fixed offset to UTC.
     """
 
-    def __init__(self, offset):
+    def __init__(self, offset, name=None, transition_type=None):
         """
         :param offset: offset to UTC in seconds.
         :type offset: int
@@ -338,21 +339,37 @@ def __init__(self, offset):
         minutes = offset / 60
         hour, minute = divmod(abs(int(minutes)), 60)
 
-        name = '{0}{1:02d}:{2:02d}'.format(sign, hour, minute)
+        if not name:
+            name = '{0}{1:02d}:{2:02d}'.format(sign, hour, minute)
 
-        transition_type = TransitionType(int(offset), False, '')
+        if not transition_type:
+            transition_type = TransitionType(int(offset), False, '')
 
-        super(FixedTimezone, self).__init__(name, [], [], 0, (0,))
+        super(FixedTimezone, self).__init__(name, [], [], 0, (datetime(1970, 1, 1),))
 
         self._tzinfos = (TimezoneInfo(self, transition_type),)
 
+    def utcoffset(self, dt):
+        if dt is None:
+            return None
+
+        return self._tzinfos[0].utcoffset(dt)
+
+    def dst(self, dt):
+        if dt is None:
+            return None
+
+        return self._tzinfos[0].dst(dt)
+
+    def fromutc(self, dt):
+        return dt.replace(tzinfo=self._tzinfos[0])
+
 
-class _UTC(Timezone):
+class _UTC(FixedTimezone):
 
     def __init__(self):
-        super(_UTC, self).__init__('UTC', [], [], 0, (0,))
+        super(_UTC, self).__init__(0, 'UTC', TransitionType(0, False, 'GMT'))
 
-        self._tzinfos = (TimezoneInfo(self, TransitionType(0, False, 'GMT')),)
         UTC._tz = self
 
     def fromutc(self, dt):

tests/pendulum_tests/test_construct.py

@@ -134,6 +134,11 @@ def test_now(self):
 
         self.assertNotEqual(now.hour, in_paris.hour)
 
+    def test_now_with_fixed_offset(self):
+        now = Pendulum.now(6)
+
+        self.assertEqual(now.timezone_name, '+06:00')
+
     def test_create(self):
         with self.wrap_with_test_now(Pendulum(2016, 8, 7, 12, 34, 56)):
             now = Pendulum.now()