From 7ff697954f872dfe77b4365840892e35ddb6e364 Mon Sep 17 00:00:00 2001 From: Myles Braithwaite Date: Mon, 5 Feb 2024 21:33:49 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20Fixed=20the=20CI=20test.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mastodon_to_sqlite/client.py | 5 +---- mastodon_to_sqlite/service.py | 7 +------ tests/test_client.py | 5 +---- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/mastodon_to_sqlite/client.py b/mastodon_to_sqlite/client.py index ec20d49..b24aca1 100644 --- a/mastodon_to_sqlite/client.py +++ b/mastodon_to_sqlite/client.py @@ -10,10 +10,7 @@ def get_utc_now() -> datetime.datetime: """ Returns the current datetime in UTC. """ - try: - return datetime.datetime.now(datetime.UTC) - except AttributeError: - return datetime.datetime.now(datetime.timezone.utc) + return datetime.datetime.now(datetime.timezone.utc) class MastodonAuth(AuthBase): diff --git a/mastodon_to_sqlite/service.py b/mastodon_to_sqlite/service.py index 85eac3a..29f8134 100644 --- a/mastodon_to_sqlite/service.py +++ b/mastodon_to_sqlite/service.py @@ -198,12 +198,7 @@ def save_accounts( accounts_table.upsert_all(accounts, pk="id") if followed_id is not None or follower_id is not None: - try: - first_seen = datetime.datetime.now(datetime.UTC).isoformat() - except AttributeError: - first_seen = datetime.datetime.now( - datetime.timezone.utc - ).isoformat() + first_seen = datetime.datetime.now(datetime.timezone.utc).isoformat() following_table.upsert_all( ( diff --git a/tests/test_client.py b/tests/test_client.py index cda9105..69f18f2 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -84,10 +84,7 @@ def test_mastodon_client__request_paginated(): @responses.activate def test_mastodon_client__request_paginated__rate_limit(mocker): - try: - mock_now = datetime.datetime.now(datetime.UTC) - except AttributeError: - mock_now = datetime.datetime.now(datetime.timezone.utc) + mock_now = datetime.datetime.now(datetime.timezone.utc) rate_limit_reset_at = mock_now + datetime.timedelta( hours=1, minutes=1, seconds=30