Adds support of Pendulum instance for convert()

Author: sdispater

pendulum/tz/timezone.py

@@ -43,8 +43,8 @@ def load(cls, name):
         :rtype: Timezone
         """
         # Shortcut to UTC
-        #if name.upper() == 'UTC':
-        #    return UTC
+        if name.upper() == 'UTC':
+            return UTCTimezone
 
         if name not in cls._cache:
             (transitions,
@@ -69,11 +69,19 @@ def convert(self, dt):
 
         Otherwise, it will convert the datetime to local time.
         """
+        from ..pendulum import Pendulum
+        
         if dt.tzinfo is None:
             # we assume local time
-            return self._normalize(dt)
+            converted = self._normalize(dt)
+
+        else:
+            converted = self._convert(dt)
 
-        return self._convert(dt)
+        if isinstance(dt, Pendulum):
+            return Pendulum.instance(converted)
+
+        return converted
 
     def _normalize(self, dt):
         # if tzinfo is set, something wrong happened
@@ -229,13 +237,13 @@ def _get_timestamp(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):
         """
         :param offset: offset to UTC in seconds.
@@ -249,7 +257,7 @@ def __init__(self, offset):
         name = '{0}{1:02d}:{2:02d}'.format(sign, hour, minute)
 
         transition_type = TransitionType(int(offset), False, '')
-        
+
         super(FixedTimezone, self).__init__(name, [], [], transition_type)
 
 

tests/tz_tests/test_timezone.py

@@ -214,7 +214,6 @@ def test_subtract_time_to_new_transition_repeated(self):
         self.assertEqual(7200, dt.offset)
         self.assertTrue(dt.is_dst)
 
-
         dt = pendulum.create(2013, 11, 3, 1, 0, 0, 0, 'America/New_York')
 
         self.assertPendulum(dt, 2013, 11, 3, 1, 0, 0, 0)
@@ -228,3 +227,11 @@ def test_subtract_time_to_new_transition_repeated(self):
         self.assertEqual('America/New_York', dt.timezone_name)
         self.assertEqual(-4 * 3600, dt.offset)
         self.assertTrue(dt.is_dst)
+
+    def test_convert_accept_pendulum_instance(self):
+        dt = pendulum.create(2016, 8, 7, 12, 53, 54)
+        tz = timezone('Europe/Paris')
+        new = tz.convert(dt)
+
+        self.assertIsInstanceOfPendulum(new)
+        self.assertPendulum(new, 2016, 8, 7, 14, 53, 54)