Skip to content

Commit 62ec2a9

Browse files
committed
re-ran with pre-commit
1 parent 48814b7 commit 62ec2a9

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

pandas/_libs/tslibs/timestamps.pyx

+4-1
Original file line numberDiff line numberDiff line change
@@ -1941,7 +1941,10 @@ default 'raise'
19411941
"""
19421942

19431943
if not isinstance(ambiguous, bool) and ambiguous not in {'NaT', 'raise'}:
1944-
raise ValueError("ambiguous parameter must be one of: True, False, 'NaT', 'raise' (default)")
1944+
raise ValueError(
1945+
"ambiguous parameter must be one of: "
1946+
"True, False, 'NaT', 'raise' (default)"
1947+
)
19451948

19461949
nonexistent_options = ('raise', 'NaT', 'shift_forward', 'shift_backward')
19471950
if nonexistent not in nonexistent_options and not PyDelta_Check(nonexistent):

pandas/tests/scalar/timestamp/test_timezones.py

-20
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
datetime,
77
timedelta,
88
)
9-
10-
# import dateutil
119
import re
1210

1311
from dateutil.tz import (
@@ -30,8 +28,6 @@
3028
Timestamp,
3129
)
3230

33-
# import pandas.util._test_decorators as td
34-
3531

3632
class TestTimestampTZOperations:
3733
# --------------------------------------------------------------
@@ -342,22 +338,6 @@ def test_astimezone(self, tzstr):
342338
assert expected == result
343339
assert isinstance(result, Timestamp)
344340

345-
# @td.skip_if_windows
346-
# def test_tz_convert_utc_with_system_utc(self):
347-
348-
# # from system utc to real utc
349-
# ts = Timestamp("2001-01-05 11:56", tz=timezones.maybe_get_tz("dateutil/UTC"))
350-
# # check that the time hasn't changed.
351-
# assert ts == ts.tz_convert(dateutil.tz.tzutc())
352-
353-
# # from system utc to real utc
354-
# ts = Timestamp("2001-01-05 11:56", tz=timezones.maybe_get_tz("dateutil/UTC"))
355-
# # check that the time hasn't changed.
356-
# assert ts == ts.tz_convert(dateutil.tz.tzutc())
357-
358-
# ------------------------------------------------------------------
359-
# Timestamp.__init__ with tz str or tzinfo
360-
361341
def test_timestamp_constructor_tz_utc(self):
362342
utc_stamp = Timestamp("3/11/2012 05:00", tz="utc")
363343
assert utc_stamp.tzinfo is pytz.utc

0 commit comments

Comments
 (0)