BUG: more tz conversion testing

Author: wesm

pandas/src/datetime.pyx

@@ -844,7 +844,7 @@ cdef ndarray _unbox_utcoffsets(object transinfo):
     return arr
 
 
-def tz_localize_array(ndarray[int64_t] vals, object tz):
+def tz_localize(ndarray[int64_t] vals, object tz):
     """
     Localize tzinfo-naive DateRange to given time zone (using pytz). If
     there are ambiguities in the values, raise AmbiguousTimeError.

pandas/tseries/index.py

@@ -968,11 +968,14 @@ def tz_normalize(self, tz):
         -------
         normalized : DatetimeIndex
         """
-        from pandas._tseries import tz_convert
         tz = tools._maybe_get_tz(tz)
-        new_dates = tz_convert(self.asi8, self.tz, tz)
-        new_dates = new_dates.view('M8[us]')
 
+        if self.tz is None:
+            new_dates = lib.tz_localize(self.asi8, tz)
+        else:
+            new_dates = lib.tz_convert(self.asi8, self.tz, tz)
+
+        new_dates = new_dates.view('M8[us]')
         new_dates = new_dates.view(type(self))
         new_dates.offset = self.offset
         new_dates.tz = tz
@@ -992,7 +995,7 @@ def tz_localize(self, tz):
                              "use tz_normalize to convert.")
         tz = tools._maybe_get_tz(tz)
 
-        new_dates = lib.tz_localize_array(self.asi8, tz)
+        new_dates = lib.tz_localize(self.asi8, tz)
         new_dates = new_dates.view('M8[us]')
         new_dates = new_dates.view(self.__class__)
         new_dates.offset = self.offset

pandas/tseries/tests/test_timeseries.py

@@ -738,6 +738,13 @@ def test_index_equals_with_tz(self):
 
         self.assert_(not left.equals(right))
 
+    def test_tz_normalize_naive(self):
+        rng = date_range('1/1/2011', periods=100, freq='H')
+
+        conv = rng.tz_normalize('US/Pacific')
+        exp = rng.tz_localize('US/Pacific')
+        self.assert_(conv.equals(exp))
+
     def test_tz_convert(self):
         rng = date_range('1/1/2011', periods=100, freq='H')
         ts = Series(1, index=rng)