Skip to content

Replace deprecated datetime module APIs #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jelmer merged 1 commit into from
Jun 17, 2025
+20 −14
Merged

Replace deprecated datetime module APIs #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/all-pythons
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def run_for_python(version, result, tests):


def now():
return datetime.utcnow().replace(tzinfo=iso8601.Utc())
return datetime.now(tz=iso8601.Utc())



Expand Down
32 changes: 19 additions & 13 deletions testtools/tests/test_testresult.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@
testresources = try_import("testresources")


def _utcfromtimestamp(t):
return datetime.datetime.fromtimestamp(t, tz=datetime.timezone.utc).replace(
tzinfo=None
)


def make_erroring_test():
class Test(TestCase):
def error(self):
Expand Down Expand Up @@ -1093,7 +1099,7 @@ def setUp(self):
def test_startMakeResource(self):
log = LoggingStreamResult()
result = ResourcedToStreamDecorator(log)
timestamp = datetime.datetime.utcfromtimestamp(3.476)
timestamp = _utcfromtimestamp(3.476)
result.startTestRun()
result.time(timestamp)
resource = testresources.TestResourceManager()
Expand Down Expand Up @@ -1945,8 +1951,8 @@ def test_forward_addError(self):
# that test, as we now know that test is complete.
[result], events = self.make_results(1)
exc_info = make_exception_info(RuntimeError, "error")
start_time = datetime.datetime.utcfromtimestamp(1.489)
end_time = datetime.datetime.utcfromtimestamp(51.476)
start_time = _utcfromtimestamp(1.489)
end_time = _utcfromtimestamp(51.476)
result.time(start_time)
result.startTest(self)
result.time(end_time)
Expand All @@ -1967,8 +1973,8 @@ def test_forward_addFailure(self):
# for that test, as we now know that test is complete.
[result], events = self.make_results(1)
exc_info = make_exception_info(AssertionError, "failure")
start_time = datetime.datetime.utcfromtimestamp(2.489)
end_time = datetime.datetime.utcfromtimestamp(3.476)
start_time = _utcfromtimestamp(2.489)
end_time = _utcfromtimestamp(3.476)
result.time(start_time)
result.startTest(self)
result.time(end_time)
Expand All @@ -1989,8 +1995,8 @@ def test_forward_addSkip(self):
# that test, as we now know that test is complete.
[result], events = self.make_results(1)
reason = "Skipped for some reason"
start_time = datetime.datetime.utcfromtimestamp(4.489)
end_time = datetime.datetime.utcfromtimestamp(5.476)
start_time = _utcfromtimestamp(4.489)
end_time = _utcfromtimestamp(5.476)
result.time(start_time)
result.startTest(self)
result.time(end_time)
Expand All @@ -2010,8 +2016,8 @@ def test_forward_addSuccess(self):
# Once we receive an addSuccess event, we forward all of the events
# for that test, as we now know that test is complete.
[result], events = self.make_results(1)
start_time = datetime.datetime.utcfromtimestamp(6.489)
end_time = datetime.datetime.utcfromtimestamp(7.476)
start_time = _utcfromtimestamp(6.489)
end_time = _utcfromtimestamp(7.476)
result.time(start_time)
result.startTest(self)
result.time(end_time)
Expand All @@ -2033,10 +2039,10 @@ def test_only_one_test_at_a_time(self):
# events for one test at a time.
[result1, result2], events = self.make_results(2)
test1, test2 = self, make_test()
start_time1 = datetime.datetime.utcfromtimestamp(1.489)
end_time1 = datetime.datetime.utcfromtimestamp(2.476)
start_time2 = datetime.datetime.utcfromtimestamp(3.489)
end_time2 = datetime.datetime.utcfromtimestamp(4.489)
start_time1 = _utcfromtimestamp(1.489)
end_time1 = _utcfromtimestamp(2.476)
start_time2 = _utcfromtimestamp(3.489)
end_time2 = _utcfromtimestamp(4.489)
result1.time(start_time1)
result2.time(start_time2)
result1.startTest(test1)
Expand Down