Unverified Commit b2e7a1ff authored by Rémi NICOLE's avatar Rémi NICOLE Committed by GitHub
Browse files

peering-manager: fix runtime with pyixapi 0.2.3 (#340164)

parents 00c3eae8 8eb293fe
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ python3.pkgs.buildPythonApplication rec {

  format = "other";

  patches = [
    # Fix compatibility with pyixapi 0.2.3
    # https://github.com/peering-manager/peering-manager/commit/ee558ff66e467412942559a8a92252e3fc009920
    ./fix-pyixapi-0.2.3-compatibility.patch
  ];

  propagatedBuildInputs = with python3.pkgs; [
    django
    djangorestframework
+30 −0
Original line number Diff line number Diff line
From ee558ff66e467412942559a8a92252e3fc009920 Mon Sep 17 00:00:00 2001
From: Guillaume Mazoyer <guillaume@mazoyer.eu>
Date: Wed, 21 Feb 2024 23:32:32 +0100
Subject: [PATCH] Use pyixapi 0.2.3

---
diff --git a/extras/models/ixapi.py b/extras/models/ixapi.py
index 65572c971e065e3deed69465a71a54b4e1372851..637a004043e0a044c65a5e37fbb2b3bf82965436 100644
--- a/extras/models/ixapi.py
+++ b/extras/models/ixapi.py
@@ -7,7 +7,6 @@
 from django.db import models
 from django.db.models import Q
 from django.urls import reverse
-from django.utils.timezone import make_aware
 
 from peering_manager.models import ChangeLoggedModel
 
@@ -117,9 +116,9 @@ def dial(self):
         if auth:
             # Save tokens if they've changed
             self.access_token = api.access_token.encoded
-            self.access_token_expiration = make_aware(api.access_token.expires_at)
+            self.access_token_expiration = api.access_token.expires_at
             self.refresh_token = api.refresh_token.encoded
-            self.refresh_token_expiration = make_aware(api.refresh_token.expires_at)
+            self.refresh_token_expiration = api.refresh_token.expires_at
             self.save()
 
         return api