diff --git a/liberapay/elsewhere/_base.py b/liberapay/elsewhere/_base.py index 9a3b2fe4c..93dfd5f18 100644 --- a/liberapay/elsewhere/_base.py +++ b/liberapay/elsewhere/_base.py @@ -1,5 +1,6 @@ from dataclasses import dataclass from datetime import datetime, timezone +from functools import cached_property import hashlib import json import logging @@ -9,7 +10,6 @@ import xml.etree.ElementTree as ET from babel.dates import format_timedelta -from cached_property import cached_property from dateutil.parser import parse as parse_date from pando.utils import utc from oauthlib.oauth2 import BackendApplicationClient, InvalidGrantError, TokenExpiredError diff --git a/liberapay/i18n/base.py b/liberapay/i18n/base.py index 7aa2e6ca9..8770df1c1 100644 --- a/liberapay/i18n/base.py +++ b/liberapay/i18n/base.py @@ -1,6 +1,7 @@ from collections import namedtuple from datetime import date, datetime, timedelta from decimal import Decimal, InvalidOperation +from functools import cached_property from sys import intern from unicodedata import combining, normalize import warnings @@ -9,7 +10,6 @@ from babel.dates import format_date, format_datetime, format_time, format_timedelta from babel.messages.pofile import Catalog from babel.numbers import parse_pattern -from cached_property import cached_property from markupsafe import Markup import opencc from pando.utils import utcnow diff --git a/liberapay/models/exchange_route.py b/liberapay/models/exchange_route.py index d1df9bf7d..43f14e777 100644 --- a/liberapay/models/exchange_route.py +++ b/liberapay/models/exchange_route.py @@ -1,7 +1,7 @@ from calendar import monthrange from datetime import date +from functools import cached_property -from cached_property import cached_property from postgres.orm import Model import stripe diff --git a/liberapay/models/participant.py b/liberapay/models/participant.py index e28d7f561..5d99bfb76 100644 --- a/liberapay/models/participant.py +++ b/liberapay/models/participant.py @@ -3,6 +3,7 @@ from datetime import date, timedelta from decimal import Decimal from email.utils import formataddr +from functools import cached_property from hashlib import pbkdf2_hmac, md5, sha1 from operator import attrgetter, itemgetter from os import urandom @@ -15,7 +16,6 @@ import uuid import aspen_jinja2_renderer -from cached_property import cached_property from dateutil.parser import parse as parse_date from dns.exception import DNSException from dns.resolver import Cache as DNSCache, Resolver as DNSResolver diff --git a/liberapay/models/tip.py b/liberapay/models/tip.py index 75dabc480..0c62ebf08 100644 --- a/liberapay/models/tip.py +++ b/liberapay/models/tip.py @@ -1,6 +1,6 @@ from datetime import timedelta +from functools import cached_property -from cached_property import cached_property from postgres.orm import Model diff --git a/liberapay/website.py b/liberapay/website.py index a97a699bc..9b16b44b8 100644 --- a/liberapay/website.py +++ b/liberapay/website.py @@ -5,10 +5,10 @@ from contextvars import ContextVar, copy_context from datetime import timedelta +from functools import cached_property import logging import os -from cached_property import cached_property from environment import Environment, is_yesish from markupsafe import Markup from pando.utils import utcnow diff --git a/requirements_base.txt b/requirements_base.txt index ac9b718d7..ae0f1d3c4 100644 --- a/requirements_base.txt +++ b/requirements_base.txt @@ -541,10 +541,6 @@ boto3==1.35.13 \ --hash=sha256:263ed587a5803c6c708d3ce44dc4dfedaab4c1a32e8329bab818933d79ddcf5d \ --hash=sha256:4f50ed74ab84d474ce614475e0b8d5047ff080810aac5d01ea25231cfc944b0c -cached-property==1.5.2 \ - --hash=sha256:9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130 \ - --hash=sha256:df4f613cf7ad9a588cc381aaf4a512d26265ecebd5eb9e1ba12f1319eb85a6a0 - stripe==11.1.1 \ --hash=sha256:0bbdfe54a09728fc54db6bb099b2f440ffc111d07d9674b0f04bfd0d3c1cbdcf \ --hash=sha256:e79e02238d0ec7c89a64986af941dcae41e4857489b7cc83497acce9def356e5