Run pyupgrade --py312-plus **/*.py

bedrock/base/tests/test_views.py

@@ -51,7 +51,7 @@ def test_no_country(self):
 @pytest.mark.django_db
 def test_get_contentful_sync_info(mock_timeago_format, mock_tz_now):
     mock_timeago_format.return_value = "mock-formatted-time-delta"
-    _now = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)
+    _now = datetime.datetime.utcnow().replace(tzinfo=datetime.UTC)
     mock_tz_now.return_value = _now
 
     middle = tz_now()

bedrock/cms/tests/test_rendering.py

@@ -109,5 +109,5 @@ def test_locales_are_drawn_from_page_translations(minimal_site, rf, serving_meth
     page_content = str(resp.content)
     assert "Test Page" in page_content
     assert '<option lang="en-US" value="en-US" selected>English</option>' in page_content
-    assert '<option lang="fr" value="fr">Français</option>'.encode("utf-8") in resp.content
+    assert '<option lang="fr" value="fr">Français</option>'.encode() in resp.content
     assert '<option lang="en-GB" value="en-US">English (British) </option>' not in page_content

bedrock/mozorg/management/commands/update_root_store_policy_page.py

@@ -59,7 +59,7 @@ def _wrap_html_with_django_template(self, html):
         # Note: we don't want to render the actual template at this stage,
         # we just want to augment what's IN the template with the HTML from
         # the Policy doc, rendered from Markdown
-        with open(WRAPPING_TEMPLATE_PATH, "r") as fp:
+        with open(WRAPPING_TEMPLATE_PATH) as fp:
             template = fp.read()
         wrapped_html = template.replace("__HTML_POLICY_CONTENT_PLACEHOLDER__", html)
         return wrapped_html

bedrock/pocketfeed/api.py

@@ -35,7 +35,7 @@ def complete_articles_data(articles):
         article["pocket_id"] = article["id"]
 
         # convert time_shared from unix timestamp to datetime
-        article["time_shared"] = make_aware(datetime.datetime.fromtimestamp(int(article["time_shared"])), datetime.timezone.utc)
+        article["time_shared"] = make_aware(datetime.datetime.fromtimestamp(int(article["time_shared"])), datetime.UTC)
 
         # remove data points we don't need
         del article["comment"]

bedrock/pocketfeed/tests/test_api.py

@@ -54,7 +54,7 @@ def test_complete_articles_data(req_mock):
     assert "quote" not in articles[0][1]
 
     # 'time_shared' should be converted to a datetime value
-    assert articles[0][1]["time_shared"] == make_aware(datetime.datetime(2018, 7, 18, 11, 14, 18), datetime.timezone.utc)
+    assert articles[0][1]["time_shared"] == make_aware(datetime.datetime(2018, 7, 18, 11, 14, 18), datetime.UTC)
 
     # should have attempted to GET request against image_src
     req_mock.get.assert_called_once_with("https://www.test.com/test.png")

bin/check-pinned-requirements.py

@@ -11,7 +11,7 @@
 def extract_pinned(requirements_file):
     """Extract pinned dependencies from a requirements file."""
     pinned_deps = {}
-    with open(requirements_file, "r") as file:
+    with open(requirements_file) as file:
         for line in file:
             # Skip comments and empty lines
             if line.strip() and not line.startswith("#"):