From fe8cfebe065f41aa97851ff6ec10a4f7af7040459995af2cf2aae4caa5b0530f Mon Sep 17 00:00:00 2001
From: Alberto Planas Dominguez <aplanas@suse.com>
Date: Tue, 18 Jul 2023 13:27:33 +0000
Subject: [PATCH] Accepting request 1099276 from
 home:mcalabkova:branches:devel:languages:python:django

- Add upstream sanitize_address.patch
  * fixes build with yet another CPython upstream fix (bsc#1210638)

OBS-URL: https://build.opensuse.org/request/show/1099276
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-Django?expand=0&rev=141
---
 python-Django.changes  |  6 ++++++
 python-Django.spec     |  2 ++
 sanitize_address.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 sanitize_address.patch

diff --git a/python-Django.changes b/python-Django.changes
index 9ee67db..ad45365 100644
--- a/python-Django.changes
+++ b/python-Django.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 18 12:50:29 UTC 2023 - Markéta Machová <mmachova@suse.com>
+
+- Add upstream sanitize_address.patch
+  * fixes build with yet another CPython upstream fix (bsc#1210638)
+
 -------------------------------------------------------------------
 Mon Jul 10 09:28:42 UTC 2023 - Alberto Planas Dominguez <aplanas@suse.com>
 
diff --git a/python-Django.spec b/python-Django.spec
index bbc46f1..ddd5518 100644
--- a/python-Django.spec
+++ b/python-Django.spec
@@ -33,6 +33,8 @@ Source:         https://www.djangoproject.com/m/releases/4.2/Django-%{version}.t
 Source1:        https://media.djangoproject.com/pgp/Django-%{version}.checksum.txt
 Source2:        %{name}.keyring
 Source99:       python-Django-rpmlintrc
+# PATCH-FIX-UPSTREAM https://github.com/django/django/commit/da2f8e8257d1bea4215381684ca4abfcee333c43  Refs #34118 -- Improved sanitize_address() error message for tuple with empty strings.
+Patch:          sanitize_address.patch
 BuildRequires:  %{python_module Jinja2 >= 2.9.2}
 BuildRequires:  %{python_module Pillow >= 6.2.0}
 BuildRequires:  %{python_module PyYAML}
diff --git a/sanitize_address.patch b/sanitize_address.patch
new file mode 100644
index 0000000..f9a5916
--- /dev/null
+++ b/sanitize_address.patch
@@ -0,0 +1,40 @@
+From da2f8e8257d1bea4215381684ca4abfcee333c43 Mon Sep 17 00:00:00 2001
+From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
+Date: Mon, 17 Jul 2023 11:03:36 +0200
+Subject: [PATCH] Refs #34118 -- Improved sanitize_address() error message for
+ tuple with empty strings.
+
+---
+ django/core/mail/message.py | 2 ++
+ tests/mail/tests.py         | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/django/core/mail/message.py b/django/core/mail/message.py
+index f3fe6186c7f5..4f8c93e9e55e 100644
+--- a/django/core/mail/message.py
++++ b/django/core/mail/message.py
+@@ -97,6 +97,8 @@ def sanitize_address(addr, encoding):
+             domain = token.domain or ""
+     else:
+         nm, address = addr
++        if "@" not in address:
++            raise ValueError(f'Invalid address "{address}"')
+         localpart, domain = address.rsplit("@", 1)
+ 
+     address_parts = nm + localpart + domain
+diff --git a/tests/mail/tests.py b/tests/mail/tests.py
+index 54a136c1a98b..848ee32e9f80 100644
+--- a/tests/mail/tests.py
++++ b/tests/mail/tests.py
+@@ -1084,9 +1084,10 @@ def test_sanitize_address_invalid(self):
+             "@",
+             "to@",
+             "@example.com",
++            ("", ""),
+         ):
+             with self.subTest(email_address=email_address):
+-                with self.assertRaises(ValueError):
++                with self.assertRaisesMessage(ValueError, "Invalid address"):
+                     sanitize_address(email_address, encoding="utf-8")
+ 
+     def test_sanitize_address_header_injection(self):