From e28559cda687d9d28af690861db8ad7a7858600f Mon Sep 17 00:00:00 2001
From: Tomas Roun <tomas.roun8@gmail.com>
Date: Mon, 7 Apr 2025 22:59:44 +0200
Subject: [PATCH 1/4] Test various encodings with pygettext

---
 .../test_tools/i18n_data/encodings/ascii.pot  | 27 ++++++++++++++++
 .../test_tools/i18n_data/encodings/ascii.py   | 10 ++++++
 .../i18n_data/encodings/ascii_escaped.pot     | 27 ++++++++++++++++
 .../test_tools/i18n_data/encodings/latin1.pot | 32 +++++++++++++++++++
 .../test_tools/i18n_data/encodings/latin1.py  | 13 ++++++++
 .../i18n_data/encodings/latin1_escaped.pot    | 32 +++++++++++++++++++
 .../i18n_data/encodings/windows1252.pot       | 32 +++++++++++++++++++
 .../i18n_data/encodings/windows1252.py        | 13 ++++++++
 .../encodings/windows1252_escaped.pot         | 32 +++++++++++++++++++
 Lib/test/test_tools/test_i18n.py              |  7 ++++
 10 files changed, 225 insertions(+)
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/ascii.pot
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/ascii.py
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/ascii_escaped.pot
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/latin1.pot
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/latin1.py
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/latin1_escaped.pot
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/windows1252.pot
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/windows1252.py
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/windows1252_escaped.pot

diff --git a/Lib/test/test_tools/i18n_data/encodings/ascii.pot b/Lib/test/test_tools/i18n_data/encodings/ascii.pot
new file mode 100644
index 00000000000000..fd48f95046865c
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/ascii.pot
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-01-01 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#. ascii text
+#: ascii.py:7
+msgid "foo"
+msgstr ""
+
+#. non-ascii text
+#: ascii.py:10
+msgid "α β"
+msgstr ""
+
diff --git a/Lib/test/test_tools/i18n_data/encodings/ascii.py b/Lib/test/test_tools/i18n_data/encodings/ascii.py
new file mode 100644
index 00000000000000..f0be8c47a312a7
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/ascii.py
@@ -0,0 +1,10 @@
+# -*- coding: ascii -*-
+
+from gettext import gettext as _
+
+
+# ascii text
+_('foo')
+
+# non-ascii text
+_('\u03b1 \u03b2')
diff --git a/Lib/test/test_tools/i18n_data/encodings/ascii_escaped.pot b/Lib/test/test_tools/i18n_data/encodings/ascii_escaped.pot
new file mode 100644
index 00000000000000..5b0385f3e4d700
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/ascii_escaped.pot
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-01-01 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#. ascii text
+#: ascii.py:7
+msgid "foo"
+msgstr ""
+
+#. non-ascii text
+#: ascii.py:10
+msgid "\316\261 \316\262"
+msgstr ""
+
diff --git a/Lib/test/test_tools/i18n_data/encodings/latin1.pot b/Lib/test/test_tools/i18n_data/encodings/latin1.pot
new file mode 100644
index 00000000000000..46df294515a4d8
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/latin1.pot
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-01-01 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#. ascii text
+#: latin1.py:7
+msgid "foo"
+msgstr ""
+
+#. latin-1 text
+#: latin1.py:10
+msgid "Å ø"
+msgstr ""
+
+#. non-latin-1 text
+#: latin1.py:13
+msgid "α β"
+msgstr ""
+
diff --git a/Lib/test/test_tools/i18n_data/encodings/latin1.py b/Lib/test/test_tools/i18n_data/encodings/latin1.py
new file mode 100644
index 00000000000000..eed0ab6371d435
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/latin1.py
@@ -0,0 +1,13 @@
+# -*- coding: latin-1 -*-
+
+from gettext import gettext as _
+
+
+# ascii text
+_('foo')
+
+# latin-1 text
+_('Å ø')
+
+# non-latin-1 text
+_('\u03b1 \u03b2')
diff --git a/Lib/test/test_tools/i18n_data/encodings/latin1_escaped.pot b/Lib/test/test_tools/i18n_data/encodings/latin1_escaped.pot
new file mode 100644
index 00000000000000..7c56f0606581f1
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/latin1_escaped.pot
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-01-01 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#. ascii text
+#: latin1.py:7
+msgid "foo"
+msgstr ""
+
+#. latin-1 text
+#: latin1.py:10
+msgid "\303\205 \303\270"
+msgstr ""
+
+#. non-latin-1 text
+#: latin1.py:13
+msgid "\316\261 \316\262"
+msgstr ""
+
diff --git a/Lib/test/test_tools/i18n_data/encodings/windows1252.pot b/Lib/test/test_tools/i18n_data/encodings/windows1252.pot
new file mode 100644
index 00000000000000..675e49e0da72fd
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/windows1252.pot
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-01-01 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#. ascii text
+#: windows1252.py:7
+msgid "foo"
+msgstr ""
+
+#. windows-1252 text
+#: windows1252.py:10
+msgid "€ ƒ"
+msgstr ""
+
+#. non-windows-1252 text
+#: windows1252.py:13
+msgid "α β"
+msgstr ""
+
diff --git a/Lib/test/test_tools/i18n_data/encodings/windows1252.py b/Lib/test/test_tools/i18n_data/encodings/windows1252.py
new file mode 100644
index 00000000000000..53d36ea556a10d
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/windows1252.py
@@ -0,0 +1,13 @@
+# -*- coding: windows-1252 -*-
+
+from gettext import gettext as _
+
+
+# ascii text
+_('foo')
+
+# windows-1252 text
+_('€ ƒ')
+
+# non-windows-1252 text
+_('\u03b1 \u03b2')
diff --git a/Lib/test/test_tools/i18n_data/encodings/windows1252_escaped.pot b/Lib/test/test_tools/i18n_data/encodings/windows1252_escaped.pot
new file mode 100644
index 00000000000000..dcd6647d018320
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/windows1252_escaped.pot
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-01-01 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#. ascii text
+#: windows1252.py:7
+msgid "foo"
+msgstr ""
+
+#. windows-1252 text
+#: windows1252.py:10
+msgid "\342\202\254 \306\222"
+msgstr ""
+
+#. non-windows-1252 text
+#: windows1252.py:13
+msgid "\316\261 \316\262"
+msgstr ""
+
diff --git a/Lib/test/test_tools/test_i18n.py b/Lib/test/test_tools/test_i18n.py
index 66c33077423229..de4dee321270f4 100644
--- a/Lib/test/test_tools/test_i18n.py
+++ b/Lib/test/test_tools/test_i18n.py
@@ -531,6 +531,13 @@ def extract_from_snapshots():
         'escapes.py': ('--escape', '--add-comments='),
         # Escape only ascii and let unicode pass through:
         ('escapes.py', 'ascii-escapes.pot'): ('--add-comments=',),
+        # Test input files with various encodings:
+        ('encodings/ascii.py', 'encodings/ascii.pot'): ('--add-comments=',),
+        ('encodings/ascii.py', 'encodings/ascii_escaped.pot'): ('--add-comments=', '--escape'),
+        ('encodings/latin1.py', 'encodings/latin1.pot'): ('--add-comments=',),
+        ('encodings/latin1.py', 'encodings/latin1_escaped.pot'): ('--add-comments=', '--escape'),
+        ('encodings/windows1252.py', 'encodings/windows1252.pot'): ('--add-comments=',),
+        ('encodings/windows1252.py', 'encodings/windows1252_escaped.pot'): ('--add-comments=', '--escape'),
     }
 
     for filename, args in snapshots.items():

From e12bb90a5e8fb2679c3f005fe1445fe4e811df50 Mon Sep 17 00:00:00 2001
From: Tomas Roun <tomas.roun8@gmail.com>
Date: Tue, 8 Apr 2025 00:01:20 +0200
Subject: [PATCH 2/4] Update test subdirs

---
 Makefile.pre.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index e10c78d6403472..80f8b67b400242 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2644,6 +2644,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/test_tomllib/data/valid/multiline-basic-str \
 		test/test_tools \
 		test/test_tools/i18n_data \
+		test/test_tools/i18n_data/encodings \
 		test/test_tools/msgfmt_data \
 		test/test_ttk \
 		test/test_unittest \

From cad1efd01b367e295fb10b3eb3995926088c1d06 Mon Sep 17 00:00:00 2001
From: Tomas Roun <tomas.roun8@gmail.com>
Date: Sat, 12 Apr 2025 12:16:20 +0200
Subject: [PATCH 3/4] Use latin2 encoding

---
 .../test_tools/i18n_data/encodings/ascii.pot  | 27 ----------------
 .../test_tools/i18n_data/encodings/ascii.py   | 10 ------
 .../i18n_data/encodings/ascii_escaped.pot     | 27 ----------------
 .../test_tools/i18n_data/encodings/latin1.pot | 32 -------------------
 .../test_tools/i18n_data/encodings/latin1.py  | 13 --------
 .../i18n_data/encodings/latin1_escaped.pot    | 32 -------------------
 .../encodings/{windows1252.pot => latin2.pot} | 18 +++++++----
 .../test_tools/i18n_data/encodings/latin2.py  | 17 ++++++++++
 ...ows1252_escaped.pot => latin2_escaped.pot} | 18 +++++++----
 .../i18n_data/encodings/windows1252.py        | 13 --------
 Lib/test/test_tools/test_i18n.py              |  8 ++---
 11 files changed, 43 insertions(+), 172 deletions(-)
 delete mode 100644 Lib/test/test_tools/i18n_data/encodings/ascii.pot
 delete mode 100644 Lib/test/test_tools/i18n_data/encodings/ascii.py
 delete mode 100644 Lib/test/test_tools/i18n_data/encodings/ascii_escaped.pot
 delete mode 100644 Lib/test/test_tools/i18n_data/encodings/latin1.pot
 delete mode 100644 Lib/test/test_tools/i18n_data/encodings/latin1.py
 delete mode 100644 Lib/test/test_tools/i18n_data/encodings/latin1_escaped.pot
 rename Lib/test/test_tools/i18n_data/encodings/{windows1252.pot => latin2.pot} (75%)
 create mode 100644 Lib/test/test_tools/i18n_data/encodings/latin2.py
 rename Lib/test/test_tools/i18n_data/encodings/{windows1252_escaped.pot => latin2_escaped.pot} (74%)
 delete mode 100644 Lib/test/test_tools/i18n_data/encodings/windows1252.py

diff --git a/Lib/test/test_tools/i18n_data/encodings/ascii.pot b/Lib/test/test_tools/i18n_data/encodings/ascii.pot
deleted file mode 100644
index fd48f95046865c..00000000000000
--- a/Lib/test/test_tools/i18n_data/encodings/ascii.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-01-01 00:00+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-
-
-#. ascii text
-#: ascii.py:7
-msgid "foo"
-msgstr ""
-
-#. non-ascii text
-#: ascii.py:10
-msgid "α β"
-msgstr ""
-
diff --git a/Lib/test/test_tools/i18n_data/encodings/ascii.py b/Lib/test/test_tools/i18n_data/encodings/ascii.py
deleted file mode 100644
index f0be8c47a312a7..00000000000000
--- a/Lib/test/test_tools/i18n_data/encodings/ascii.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: ascii -*-
-
-from gettext import gettext as _
-
-
-# ascii text
-_('foo')
-
-# non-ascii text
-_('\u03b1 \u03b2')
diff --git a/Lib/test/test_tools/i18n_data/encodings/ascii_escaped.pot b/Lib/test/test_tools/i18n_data/encodings/ascii_escaped.pot
deleted file mode 100644
index 5b0385f3e4d700..00000000000000
--- a/Lib/test/test_tools/i18n_data/encodings/ascii_escaped.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-01-01 00:00+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-
-
-#. ascii text
-#: ascii.py:7
-msgid "foo"
-msgstr ""
-
-#. non-ascii text
-#: ascii.py:10
-msgid "\316\261 \316\262"
-msgstr ""
-
diff --git a/Lib/test/test_tools/i18n_data/encodings/latin1.pot b/Lib/test/test_tools/i18n_data/encodings/latin1.pot
deleted file mode 100644
index 46df294515a4d8..00000000000000
--- a/Lib/test/test_tools/i18n_data/encodings/latin1.pot
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-01-01 00:00+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-
-
-#. ascii text
-#: latin1.py:7
-msgid "foo"
-msgstr ""
-
-#. latin-1 text
-#: latin1.py:10
-msgid "Å ø"
-msgstr ""
-
-#. non-latin-1 text
-#: latin1.py:13
-msgid "α β"
-msgstr ""
-
diff --git a/Lib/test/test_tools/i18n_data/encodings/latin1.py b/Lib/test/test_tools/i18n_data/encodings/latin1.py
deleted file mode 100644
index eed0ab6371d435..00000000000000
--- a/Lib/test/test_tools/i18n_data/encodings/latin1.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: latin-1 -*-
-
-from gettext import gettext as _
-
-
-# ascii text
-_('foo')
-
-# latin-1 text
-_('Å ø')
-
-# non-latin-1 text
-_('\u03b1 \u03b2')
diff --git a/Lib/test/test_tools/i18n_data/encodings/latin1_escaped.pot b/Lib/test/test_tools/i18n_data/encodings/latin1_escaped.pot
deleted file mode 100644
index 7c56f0606581f1..00000000000000
--- a/Lib/test/test_tools/i18n_data/encodings/latin1_escaped.pot
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-01-01 00:00+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-
-
-#. ascii text
-#: latin1.py:7
-msgid "foo"
-msgstr ""
-
-#. latin-1 text
-#: latin1.py:10
-msgid "\303\205 \303\270"
-msgstr ""
-
-#. non-latin-1 text
-#: latin1.py:13
-msgid "\316\261 \316\262"
-msgstr ""
-
diff --git a/Lib/test/test_tools/i18n_data/encodings/windows1252.pot b/Lib/test/test_tools/i18n_data/encodings/latin2.pot
similarity index 75%
rename from Lib/test/test_tools/i18n_data/encodings/windows1252.pot
rename to Lib/test/test_tools/i18n_data/encodings/latin2.pot
index 675e49e0da72fd..9ae83a801bb248 100644
--- a/Lib/test/test_tools/i18n_data/encodings/windows1252.pot
+++ b/Lib/test/test_tools/i18n_data/encodings/latin2.pot
@@ -16,17 +16,23 @@ msgstr ""
 
 
 #. ascii text
-#: windows1252.py:7
+#: latin2.py:7
 msgid "foo"
 msgstr ""
 
-#. windows-1252 text
-#: windows1252.py:10
-msgid "€ ƒ"
+#. latin-2 text
+#: latin2.py:10
+msgid "Ř ř"
 msgstr ""
 
-#. non-windows-1252 text
-#: windows1252.py:13
+#. non-latin-2 text
+#: latin2.py:13
 msgid "α β"
 msgstr ""
 
+#. ascii text with non-ascii comment
+#. Ř ř
+#: latin2.py:17
+msgid "bar"
+msgstr ""
+
diff --git a/Lib/test/test_tools/i18n_data/encodings/latin2.py b/Lib/test/test_tools/i18n_data/encodings/latin2.py
new file mode 100644
index 00000000000000..7f4e67e59a0e20
--- /dev/null
+++ b/Lib/test/test_tools/i18n_data/encodings/latin2.py
@@ -0,0 +1,17 @@
+# -*- coding: iso-8859-2 -*-
+
+from gettext import gettext as _
+
+
+# ascii text
+_('foo')
+
+# latin-2 text
+_('Ø ø')
+
+# non-latin-2 text
+_('\u03b1 \u03b2')
+
+# ascii text with non-ascii comment
+# Ø ø
+_('bar')
\ No newline at end of file
diff --git a/Lib/test/test_tools/i18n_data/encodings/windows1252_escaped.pot b/Lib/test/test_tools/i18n_data/encodings/latin2_escaped.pot
similarity index 74%
rename from Lib/test/test_tools/i18n_data/encodings/windows1252_escaped.pot
rename to Lib/test/test_tools/i18n_data/encodings/latin2_escaped.pot
index dcd6647d018320..e5621fbf6b86a3 100644
--- a/Lib/test/test_tools/i18n_data/encodings/windows1252_escaped.pot
+++ b/Lib/test/test_tools/i18n_data/encodings/latin2_escaped.pot
@@ -16,17 +16,23 @@ msgstr ""
 
 
 #. ascii text
-#: windows1252.py:7
+#: latin2.py:7
 msgid "foo"
 msgstr ""
 
-#. windows-1252 text
-#: windows1252.py:10
-msgid "\342\202\254 \306\222"
+#. latin-2 text
+#: latin2.py:10
+msgid "\305\230 \305\231"
 msgstr ""
 
-#. non-windows-1252 text
-#: windows1252.py:13
+#. non-latin-2 text
+#: latin2.py:13
 msgid "\316\261 \316\262"
 msgstr ""
 
+#. ascii text with non-ascii comment
+#. Ř ř
+#: latin2.py:17
+msgid "bar"
+msgstr ""
+
diff --git a/Lib/test/test_tools/i18n_data/encodings/windows1252.py b/Lib/test/test_tools/i18n_data/encodings/windows1252.py
deleted file mode 100644
index 53d36ea556a10d..00000000000000
--- a/Lib/test/test_tools/i18n_data/encodings/windows1252.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: windows-1252 -*-
-
-from gettext import gettext as _
-
-
-# ascii text
-_('foo')
-
-# windows-1252 text
-_('€ ƒ')
-
-# non-windows-1252 text
-_('\u03b1 \u03b2')
diff --git a/Lib/test/test_tools/test_i18n.py b/Lib/test/test_tools/test_i18n.py
index de4dee321270f4..87139807b4c516 100644
--- a/Lib/test/test_tools/test_i18n.py
+++ b/Lib/test/test_tools/test_i18n.py
@@ -532,12 +532,8 @@ def extract_from_snapshots():
         # Escape only ascii and let unicode pass through:
         ('escapes.py', 'ascii-escapes.pot'): ('--add-comments=',),
         # Test input files with various encodings:
-        ('encodings/ascii.py', 'encodings/ascii.pot'): ('--add-comments=',),
-        ('encodings/ascii.py', 'encodings/ascii_escaped.pot'): ('--add-comments=', '--escape'),
-        ('encodings/latin1.py', 'encodings/latin1.pot'): ('--add-comments=',),
-        ('encodings/latin1.py', 'encodings/latin1_escaped.pot'): ('--add-comments=', '--escape'),
-        ('encodings/windows1252.py', 'encodings/windows1252.pot'): ('--add-comments=',),
-        ('encodings/windows1252.py', 'encodings/windows1252_escaped.pot'): ('--add-comments=', '--escape'),
+        ('encodings/latin2.py', 'encodings/latin2.pot'): ('--add-comments=',),
+        ('encodings/latin2.py', 'encodings/latin2_escaped.pot'): ('--add-comments=', '--escape'),
     }
 
     for filename, args in snapshots.items():

From 067807f0e93089837c8cd8df35f6a6a1d308fb01 Mon Sep 17 00:00:00 2001
From: Tomas Roun <tomas.roun8@gmail.com>
Date: Sat, 12 Apr 2025 13:01:47 +0200
Subject: [PATCH 4/4] Lint fix

---
 Lib/test/test_tools/i18n_data/encodings/latin2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/test/test_tools/i18n_data/encodings/latin2.py b/Lib/test/test_tools/i18n_data/encodings/latin2.py
index 7f4e67e59a0e20..bd5422d67f0dc8 100644
--- a/Lib/test/test_tools/i18n_data/encodings/latin2.py
+++ b/Lib/test/test_tools/i18n_data/encodings/latin2.py
@@ -14,4 +14,4 @@
 
 # ascii text with non-ascii comment
 # Ø ø
-_('bar')
\ No newline at end of file
+_('bar')