33import re
44import sys
55from collections import OrderedDict
6- from datetime import datetime , timedelta
6+ from datetime import datetime , timedelta , timezone
77from json import JSONDecodeError
88from unittest import TestCase
99from warnings import catch_warnings , simplefilter , warn
@@ -934,28 +934,34 @@ def test_assert_datetime_about_now__custom_message(self):
934934 # assert_datetime_about_now_utc()
935935
936936 def test_assert_datetime_about_now_utc__close (self ):
937- assert_datetime_about_now_utc (datetime .utcnow ())
937+ assert_datetime_about_now_utc (
938+ datetime .now (timezone .utc ).replace (tzinfo = None )
939+ )
938940
939941 def test_assert_datetime_about_now_utc__none__default_message (self ):
940942 expected_message = r"^None is not a valid date/time$"
941943 with assert_raises_regex (AssertionError , expected_message ):
942944 assert_datetime_about_now_utc (None )
943945
944946 def test_assert_datetime_about_now_utc__none__custom_message (self ):
945- dt = datetime .utcnow ( ).date ().isoformat ()
947+ dt = datetime .now ( timezone . utc ).date ().isoformat ()
946948 expected = "None is not a valid date/time;None;{}" .format (dt )
947949 with _assert_raises_assertion (expected ):
948950 assert_datetime_about_now_utc (
949951 None , msg_fmt = "{msg};{actual!r};{now:%Y-%m-%d}"
950952 )
951953
952954 def test_assert_datetime_about_now_utc__too_low (self ):
953- then = datetime .utcnow () - timedelta (minutes = 1 )
955+ then = datetime .now (timezone .utc ).replace (tzinfo = None ) - timedelta (
956+ minutes = 1
957+ )
954958 with assert_raises (AssertionError ):
955959 assert_datetime_about_now_utc (then )
956960
957961 def test_assert_datetime_about_now_utc__too_high (self ):
958- then = datetime .utcnow () + timedelta (minutes = 1 )
962+ then = datetime .now (timezone .utc ).replace (tzinfo = None ) + timedelta (
963+ minutes = 1
964+ )
959965 with assert_raises (AssertionError ):
960966 assert_datetime_about_now_utc (then )
961967
@@ -970,7 +976,7 @@ def test_assert_datetime_about_now_utc__default_message(self):
970976
971977 def test_assert_datetime_about_now_utc__custom_message (self ):
972978 then = datetime (1990 , 4 , 13 , 12 , 30 , 15 )
973- now = datetime .utcnow ( ).date ().isoformat ()
979+ now = datetime .now ( timezone . utc ).date ().isoformat ()
974980 expected = (
975981 "datetime.datetime(1990, 4, 13, 12, 30, 15) "
976982 "is not close to current UTC date/time;12:30;{}" .format (now )
0 commit comments