Skip to content

Commit 795aa19

Browse files
author
Matt Roeschke
committed
add comma after instead, fix test
1 parent 2d13808 commit 795aa19

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

doc/source/whatsnew/v0.24.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ Deprecations
967967
- The class ``FrozenNDArray`` has been deprecated. When unpickling, ``FrozenNDArray`` will be unpickled to ``np.ndarray`` once this class is removed (:issue:`9031`)
968968
- Deprecated the `nthreads` keyword of :func:`pandas.read_feather` in favor of
969969
`use_threads` to reflect the changes in pyarrow 0.11.0. (:issue:`23053`)
970-
- Timezone converting a tz-aware ``datetime.datetime`` or :class:`Timestamp` with :class:`Timestamp` and the ``tz`` argument is now deprecated. Instead use :meth:`Timestamp.tz_convert` (:issue:`23579`)
970+
- Timezone converting a tz-aware ``datetime.datetime`` or :class:`Timestamp` with :class:`Timestamp` and the ``tz`` argument is now deprecated. Instead, use :meth:`Timestamp.tz_convert` (:issue:`23579`)
971971

972972
.. _whatsnew_0240.deprecations.datetimelike_int_ops:
973973

pandas/_libs/tslibs/timestamps.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ class Timestamp(_Timestamp):
719719
# microsecond[, nanosecond[, tzinfo]]]]]])
720720
return Timestamp(datetime(ts_input, freq, tz, unit or 0,
721721
year or 0, month or 0, day or 0,
722-
minute), nanosecond=hour, tz=minute)
722+
minute), nanosecond=hour)
723723

724724
if tzinfo is not None:
725725
# User passed tzinfo instead of tz; avoid silently ignoring

0 commit comments

Comments
 (0)