Adjust methods for warning

Author: Matt Roeschke

pandas/core/arrays/datetimes.py

@@ -45,7 +45,12 @@ def _to_m8(key, tz=None):
     """
     if not isinstance(key, Timestamp):
         # this also converts strings
-        key = Timestamp(key, tz=tz)
+        key = Timestamp(key)
+        if key.tz is not None and tz is not None:
+            # Don't tz_localize(None) if key was tz-aware already
+            key = key.tz_convert(tz)
+        else:
+            key = key.tz_localize(tz)
 
     return np.int64(conversion.pydt_to_i8(key)).view(_NS_DTYPE)
 

pandas/core/generic.py

@@ -9337,9 +9337,9 @@ def describe_categorical_1d(data):
                     tz = data.dt.tz
                     asint = data.dropna().values.view('i8')
                     names += ['top', 'freq', 'first', 'last']
-                    result += [Timestamp(top, tz=tz), freq,
-                               Timestamp(asint.min(), tz=tz),
-                               Timestamp(asint.max(), tz=tz)]
+                    result += [Timestamp(top).tz_localize(tz), freq,
+                               Timestamp(asint.min()).tz_localize(tz),
+                               Timestamp(asint.max()).tz_localize(tz)]
                 else:
                     names += ['top', 'freq']
                     result += [top, freq]

pandas/core/indexes/datetimes.py

@@ -944,7 +944,7 @@ def get_value(self, series, key):
     def get_value_maybe_box(self, series, key):
         # needed to localize naive datetimes
         if self.tz is not None:
-            key = Timestamp(key, tz=self.tz)
+            key = Timestamp(key).tz_localize(self.tz)
         elif not isinstance(key, Timestamp):
             key = Timestamp(key)
         values = self._engine.get_value(com.values_from_object(series),
@@ -966,9 +966,9 @@ def get_loc(self, key, method=None, tolerance=None):
             tolerance = self._convert_tolerance(tolerance, np.asarray(key))
 
         if isinstance(key, datetime):
-            # needed to localize naive datetimes
+            # localize tz-naive datetimes OR convert tz-aware datetimes
             if key.tzinfo is None:
-                key = Timestamp(key, tz=self.tz)
+                key = Timestamp(key).tz_localize(self.tz)
             else:
                 key = Timestamp(key).tz_convert(self.tz)
             return Index.get_loc(self, key, method, tolerance)

pandas/io/formats/format.py

@@ -1246,7 +1246,7 @@ def _format_datetime64(x, tz=None, nat_rep='NaT'):
         return nat_rep
 
     if tz is not None or not isinstance(x, Timestamp):
-        x = Timestamp(x, tz=tz)
+        x = Timestamp(x).tz_localize(tz)
 
     return str(x)