Merge pull request #2300 from liberapay/python-upgrade

.github/workflows/test.yml

@@ -16,10 +16,10 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: '3.8'
-      - name: Install Python 3.9
+      - name: Install Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
       - name: Cache the .tox directory to speed things up
         uses: actions/cache@v3
         with:

cli/check-python-version.py

@@ -4,5 +4,5 @@
     print("Liberapay requires Python >= 3.8, but %s is version %s.%s" %
           (sys.executable, sys.version_info[0], sys.version_info[1]))
     sys.exit(1)
-if sys.version_info >= (3, 10, 0):
-    print("Warning: Liberapay hasn't been tested with Python >= 3.10, you might encounter bugs.")
+if sys.version_info >= (3, 13, 0):
+    print("Warning: Liberapay hasn't been tested with Python >= 3.13, you might encounter bugs.")

liberapay/elsewhere/_base.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import datetime, timezone
 import hashlib
 import json
 import logging
@@ -218,7 +218,7 @@ def log_ratelimit_headers(self, domain, limit, remaining, reset):
             return
         percent_remaining = remaining/limit
         if percent_remaining < 0.5:
-            reset_delta = reset - datetime.utcnow().replace(tzinfo=utc)
+            reset_delta = reset - datetime.now(timezone.utc)
             reset_delta = format_timedelta(reset_delta, add_direction=True, locale='en')
             log_lvl = logging.WARNING
             if percent_remaining < 0.2:

liberapay/main.py

@@ -271,14 +271,6 @@ def check_payin_allowed(website, request, user, method=None):
 Website.check_payin_allowed = check_payin_allowed
 
 
-# Monkey patch python's stdlib
-# ============================
-
-from http.cookies import Morsel
-
-Morsel._reserved['samesite'] = 'SameSite'
-
-
 # Monkey patch aspen and pando
 # ============================
 

tests/py/test_state_chain.py

@@ -80,7 +80,7 @@ def test_i18n_subdomains_work(self):
         html = r.html_tree
         assert html.attrib["lang"] == "zh-hant-tw"
         statement_section = html.find(".//{*}section[@lang='zh']")
-        assert statement_section, r.text
+        assert len(statement_section) > 0, r.text
         assert statement_section[0].text == "歡迎，"
         r = self.client.GET(
             '/alice',
@@ -91,7 +91,7 @@ def test_i18n_subdomains_work(self):
         html = r.html_tree
         assert html.attrib["lang"] == "zh-hans"
         statement_section = html.find(".//{*}section[@lang='zh-hans']")
-        assert statement_section, r.text
+        assert len(statement_section) > 0, r.text
         assert statement_section[0].text == "欢迎，"
 
     def test_i18n_subdomain_is_redirected_to_https(self):

tests/py/test_utils.py

@@ -1,4 +1,4 @@
-from datetime import date, datetime, timedelta
+from datetime import date, datetime, timedelta, timezone
 from decimal import Decimal
 
 from markupsafe import escape
@@ -92,11 +92,11 @@ def test_get_participant_redirects_after_username_change(self):
     # ===============
 
     def test_is_expired(self):
-        expiration = datetime.utcnow() - timedelta(days=40)
+        expiration = datetime.now(timezone.utc) - timedelta(days=40)
         assert utils.is_card_expired(expiration.year, expiration.month)
 
     def test_not_expired(self):
-        expiration = datetime.utcnow() + timedelta(days=100)
+        expiration = datetime.now(timezone.utc) + timedelta(days=100)
         assert not utils.is_card_expired(expiration.year, expiration.month)
 
     # Markdown

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py38,py39
+envlist = py38,py311
 skipsdist = True
 
 [testenv]

www/%username/ledger/index.spt

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from liberapay.utils import get_participant
 from liberapay.utils.history import get_payin_ledger
@@ -32,7 +32,7 @@ translated_status = {
     'suspended': _('suspended'),
 }
 
-current_year = datetime.utcnow().year
+current_year = datetime.now(timezone.utc).year
 year = request.qs.get_int('year', 0, minimum=2018, maximum=current_year)
 if not year:
     # Try to detect the year of the last transaction

www/%username/wallet/export.spt

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from liberapay.utils import get_participant
 from liberapay.utils.history import export_history
@@ -9,7 +9,7 @@ participant = get_participant(state, restrict=True)
 title = participant.username
 subhead = _("Export History")
 
-current_year = datetime.utcnow().year
+current_year = datetime.now(timezone.utc).year
 year = request.qs.get_int('year', current_year)
 
 key = request.qs.get('key')

www/%username/wallet/index.html.spt

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from liberapay.utils import get_participant
 from liberapay.utils.history import get_wallet_ledger
@@ -25,7 +25,7 @@ translated_status = {
     'succeeded': _('succeeded')
 }
 
-current_year = datetime.utcnow().year
+current_year = datetime.now(timezone.utc).year
 year = request.qs.get_int('year', 0, minimum=2016, maximum=current_year)
 if not year:
     # Try to detect the year of the last transaction

www/%username/wallet/statement.spt

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from liberapay.utils import check_address_v2, get_participant, render, render_postal_address
 from liberapay.utils.history import get_wallet_ledger
@@ -13,7 +13,7 @@ STATUS_MAP = {
 participant = get_participant(state, restrict=True)
 title = _("Account Statement")
 
-now = datetime.utcnow()
+now = datetime.now(timezone.utc)
 today = now.date()
 year = request.qs.get_int('year', now.year, minimum=2016)
 month = request.qs.get_int('month', None, minimum=1, maximum=12)