diff options
| author | 2023-09-04 15:59:58 +0100 | |
|---|---|---|
| committer | 2023-09-04 15:59:58 +0100 | |
| commit | 1369c6ddf96cea78c583a8e4940a65e4c79a9a5f (patch) | |
| tree | 91dd0406d1699cddd7d22441384a8d13e5ce58c1 | |
| parent | Relock Poetry (diff) | |
Implement fixes advised by Ruff
| -rw-r--r-- | metricity/database.py | 6 | ||||
| -rw-r--r-- | metricity/exts/status.py | 4 | ||||
| -rw-r--r-- | metricity/models.py | 6 | 
3 files changed, 8 insertions, 8 deletions
| diff --git a/metricity/database.py b/metricity/database.py index 717d3f2..19ec1ff 100644 --- a/metricity/database.py +++ b/metricity/database.py @@ -1,7 +1,7 @@  """General utility functions and classes for Metricity."""  import logging -from datetime import datetime, timezone +from datetime import UTC, datetime  import gino  from sqlalchemy.engine import Dialect @@ -50,11 +50,11 @@ class TZDateTime(TypeDecorator):          if value is not None:              if not value.tzinfo:                  raise TypeError("tzinfo is required") -            value = value.astimezone(timezone.utc).replace(tzinfo=None) +            value = value.astimezone(UTC).replace(tzinfo=None)          return value      def process_result_value(self, value: datetime, _dialect: Dialect) -> datetime:          """Convert the value to aware before passing back to user-land."""          if value is not None: -            value = value.replace(tzinfo=timezone.utc) +            value = value.replace(tzinfo=UTC)          return value diff --git a/metricity/exts/status.py b/metricity/exts/status.py index 607c1e3..aedd12b 100644 --- a/metricity/exts/status.py +++ b/metricity/exts/status.py @@ -24,7 +24,7 @@ class Status(commands.Cog):      @commands.Cog.listener()      async def on_socket_event_type(self, _: str) -> None:          """Store the last event received as an int.""" -        self.last_event_received = int(datetime.datetime.now(datetime.timezone.utc).timestamp()) +        self.last_event_received = int(datetime.datetime.now(datetime.UTC).timestamp())      @commands.command()      @commands.has_any_role(BotConfig.staff_role_id) @@ -34,7 +34,7 @@ class Status(commands.Cog):          if ctx.guild.id != BotConfig.guild_id:              return -        bot_ping = (datetime.datetime.now(datetime.timezone.utc) - ctx.message.created_at).total_seconds() * 1000 +        bot_ping = (datetime.datetime.now(datetime.UTC) - ctx.message.created_at).total_seconds() * 1000          if bot_ping <= 0:              bot_ping = "Your clock is out of sync, could not calculate ping."          else: diff --git a/metricity/models.py b/metricity/models.py index 700464e..c2ae0c7 100644 --- a/metricity/models.py +++ b/metricity/models.py @@ -1,6 +1,6 @@  """Database models used by Metricity for statistic collection.""" -from datetime import datetime, timezone +from datetime import UTC, datetime  from typing import Any  from sqlalchemy.dialects.postgresql import insert @@ -43,7 +43,7 @@ class Thread(db.Model):          db.ForeignKey("channels.id", ondelete="CASCADE"),          nullable=False,      ) -    created_at = db.Column(TZDateTime(), default=datetime.now(timezone.utc)) +    created_at = db.Column(TZDateTime(), default=datetime.now(UTC))      name = db.Column(db.String, nullable=False)      archived = db.Column(db.Boolean, default=False, nullable=False)      auto_archive_duration = db.Column(db.Integer, nullable=False) @@ -112,5 +112,5 @@ class Message(db.Model):          db.ForeignKey("users.id", ondelete="CASCADE"),          index=True,      ) -    created_at = db.Column(TZDateTime(), default=datetime.now(timezone.utc)) +    created_at = db.Column(TZDateTime(), default=datetime.now(UTC))      is_deleted = db.Column(db.Boolean, default=False) | 
