BUG: Timestamp.astimezone returns datetime.datetime #2060

Author: changhiskhan

pandas/src/datetime.pyx

@@ -238,6 +238,8 @@ class Timestamp(_Timestamp):
             # Same UTC timestamp, different time zone
             return Timestamp(self.value, tz=tz)
 
+    astimezone = tz_convert
+
     def replace(self, **kwds):
         return Timestamp(datetime.replace(self, **kwds),
                          offset=self.offset)

pandas/tseries/tests/test_timezones.py

@@ -137,6 +137,13 @@ def test_tz_localize_dti(self):
                             freq='L')
         self.assertRaises(pytz.NonExistentTimeError, dti.tz_localize, 'US/Eastern')
 
+    def test_astimezone(self):
+        utc = Timestamp('3/11/2012 22:00', tz='UTC')
+        expected = utc.tz_convert('US/Eastern')
+        result = utc.astimezone('US/Eastern')
+        self.assertEquals(expected, result)
+        self.assert_(isinstance(result, Timestamp))
+
     def test_create_with_tz(self):
         stamp = Timestamp('3/11/2012 05:00', tz='US/Eastern')
         self.assertEquals(stamp.hour, 5)