From 5b20811cabd4594fd4fafc596e3f94afe12bb361 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Tue, 20 Feb 2024 20:36:36 +0100
Subject: [PATCH 01/13] Add `--bugreport` argument to __main__.py to omit
 supported formats

---
 src/PIL/__main__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/PIL/__main__.py b/src/PIL/__main__.py
index 943789923dc..32de33624db 100644
--- a/src/PIL/__main__.py
+++ b/src/PIL/__main__.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import sys
+
 from .features import pilinfo
 
-pilinfo()
+pilinfo(supported_formats="--bugreport" not in sys.argv)

From ab9dfd8181868922abee46dffb11ffcb9a772958 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Tue, 20 Feb 2024 20:37:33 +0100
Subject: [PATCH 02/13] Add sys.{executable,base_prefix,prefix} to
 features.pilinfo

---
 Tests/test_features.py | 12 +++++++++---
 Tests/test_main.py     | 12 +++++++++---
 src/PIL/features.py    |  9 +++++++--
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Tests/test_features.py b/Tests/test_features.py
index 8d2d198ffcd..3fffa032f81 100644
--- a/Tests/test_features.py
+++ b/Tests/test_features.py
@@ -129,9 +129,15 @@ def test_pilinfo() -> None:
     while lines[0].startswith("    "):
         lines = lines[1:]
     assert lines[0] == "-" * 68
-    assert lines[1].startswith("Python modules loaded from ")
-    assert lines[2].startswith("Binary modules loaded from ")
-    assert lines[3] == "-" * 68
+    assert lines[1].startswith("Python executable is")
+    lines = lines[2:]
+    if lines[0].startswith("Environment Python files loaded from"):
+        lines = lines[1:]
+    assert lines[0].startswith("System Python files loaded from")
+    assert lines[1] == "-" * 68
+    assert lines[2].startswith("Python Pillow modules loaded from ")
+    assert lines[3].startswith("Binary Pillow modules loaded from ")
+    assert lines[4] == "-" * 68
     jpeg = (
         "\n"
         + "-" * 68
diff --git a/Tests/test_main.py b/Tests/test_main.py
index 46259f1dc52..e13e0c5e3ac 100644
--- a/Tests/test_main.py
+++ b/Tests/test_main.py
@@ -15,9 +15,15 @@ def test_main() -> None:
     while lines[0].startswith("    "):
         lines = lines[1:]
     assert lines[0] == "-" * 68
-    assert lines[1].startswith("Python modules loaded from ")
-    assert lines[2].startswith("Binary modules loaded from ")
-    assert lines[3] == "-" * 68
+    assert lines[1].startswith("Python executable is")
+    lines = lines[2:]
+    if lines[0].startswith("Environment Python files loaded from"):
+        lines = lines[1:]
+    assert lines[0].startswith("System Python files loaded from")
+    assert lines[1] == "-" * 68
+    assert lines[2].startswith("Python Pillow modules loaded from ")
+    assert lines[3].startswith("Binary Pillow modules loaded from ")
+    assert lines[4] == "-" * 68
     jpeg = (
         os.linesep
         + "-" * 68
diff --git a/src/PIL/features.py b/src/PIL/features.py
index b14d6df13f2..7c5112ef6e4 100644
--- a/src/PIL/features.py
+++ b/src/PIL/features.py
@@ -249,12 +249,17 @@ def pilinfo(out=None, supported_formats=True):
     for py_version in py_version[1:]:
         print(f"       {py_version.strip()}", file=out)
     print("-" * 68, file=out)
+    print(f"Python executable is {sys.executable or 'unknown'}", file=out)
+    if sys.prefix != sys.base_prefix:
+        print(f"Environment Python files loaded from {sys.prefix}", file=out)
+    print(f"System Python files loaded from {sys.base_prefix}", file=out)
+    print("-" * 68, file=out)
     print(
-        f"Python modules loaded from {os.path.dirname(Image.__file__)}",
+        f"Python Pillow modules loaded from {os.path.dirname(Image.__file__)}",
         file=out,
     )
     print(
-        f"Binary modules loaded from {os.path.dirname(Image.core.__file__)}",
+        f"Binary Pillow modules loaded from {os.path.dirname(Image.core.__file__)}",
         file=out,
     )
     print("-" * 68, file=out)

From 89c44be404081c77e68457c1c50a78e96a6d42b9 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Tue, 20 Feb 2024 20:39:40 +0100
Subject: [PATCH 03/13] Mention `python -m PIL --bugreport` in the issue
 template

---
 .github/ISSUE_TEMPLATE/ISSUE_REPORT.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
index 115f6135dfb..cfd576f3588 100644
--- a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
@@ -48,6 +48,10 @@ Thank you.
 * Python: 
 * Pillow: 
 
+```text
+please paste the output of running `python3 -m PIL --bugreport` here
+```
+
 <!--
 Please include **code** that reproduces the issue and whenever possible, an **image** that demonstrates the issue. Please upload images to GitHub, not to third-party file hosting sites. If necessary, add the image to a zip or tar archive.
 

From ca63a12ac209fa0e1a9156655927d04f6483840b Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Tue, 20 Feb 2024 22:50:14 +0100
Subject: [PATCH 04/13] Mention features.pilinfo directly in the issue template

---
 .github/ISSUE_TEMPLATE/ISSUE_REPORT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
index cfd576f3588..de1d14bb3e9 100644
--- a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
@@ -49,7 +49,7 @@ Thank you.
 * Pillow: 
 
 ```text
-please paste the output of running `python3 -m PIL --bugreport` here
+please paste here the output of the following Python code: `from PIL import features; features.pilinfo(supported_formats=False)`
 ```
 
 <!--

From 970c691fa2fad58682030001719775de06a74f74 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 2 Mar 2024 16:55:21 +1100
Subject: [PATCH 05/13] Document --bugreport

---
 src/PIL/features.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/PIL/features.py b/src/PIL/features.py
index 7c5112ef6e4..15ab6aa45c5 100644
--- a/src/PIL/features.py
+++ b/src/PIL/features.py
@@ -230,6 +230,9 @@ def pilinfo(out=None, supported_formats=True):
     """
     Prints information about this installation of Pillow.
     This function can be called with ``python3 -m PIL``.
+    It can also be called with ``python3 -m PIL --bugreport`` to have
+    "supported_formats" set to ``False``, omitting the list of all supported image
+    file formats.
 
     :param out:
         The output stream to print to. Defaults to ``sys.stdout`` if ``None``.

From 4dbc428434758463fadb7848fd71e747c2bb6af2 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Mon, 4 Mar 2024 20:11:32 +0100
Subject: [PATCH 06/13] list both `python3 -m PIL --bugreport` and
 `features.pilinfo` in the issue template

---
 .github/ISSUE_TEMPLATE/ISSUE_REPORT.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
index de1d14bb3e9..25768061cc4 100644
--- a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
@@ -49,7 +49,11 @@ Thank you.
 * Pillow: 
 
 ```text
-please paste here the output of the following Python code: `from PIL import features; features.pilinfo(supported_formats=False)`
+Please paste here the output of running `python3 -m PIL --bugreport`,
+or the output of the following Python code:
+
+from PIL import features
+features.pilinfo(supported_formats=False)
 ```
 
 <!--

From 07f2b965ed56919c11bf82735206efe895bc6a76 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Mon, 4 Mar 2024 20:12:40 +0100
Subject: [PATCH 07/13] rename `--bugreport` to `--report`

---
 .github/ISSUE_TEMPLATE/ISSUE_REPORT.md | 2 +-
 src/PIL/__main__.py                    | 2 +-
 src/PIL/features.py                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
index 25768061cc4..a895c55da0d 100644
--- a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
@@ -49,7 +49,7 @@ Thank you.
 * Pillow: 
 
 ```text
-Please paste here the output of running `python3 -m PIL --bugreport`,
+Please paste here the output of running `python3 -m PIL --report`,
 or the output of the following Python code:
 
 from PIL import features
diff --git a/src/PIL/__main__.py b/src/PIL/__main__.py
index 32de33624db..043156e892d 100644
--- a/src/PIL/__main__.py
+++ b/src/PIL/__main__.py
@@ -4,4 +4,4 @@
 
 from .features import pilinfo
 
-pilinfo(supported_formats="--bugreport" not in sys.argv)
+pilinfo(supported_formats="--report" not in sys.argv)
diff --git a/src/PIL/features.py b/src/PIL/features.py
index 15ab6aa45c5..a7384a0a0e9 100644
--- a/src/PIL/features.py
+++ b/src/PIL/features.py
@@ -230,7 +230,7 @@ def pilinfo(out=None, supported_formats=True):
     """
     Prints information about this installation of Pillow.
     This function can be called with ``python3 -m PIL``.
-    It can also be called with ``python3 -m PIL --bugreport`` to have
+    It can also be called with ``python3 -m PIL --report`` to have
     "supported_formats" set to ``False``, omitting the list of all supported image
     file formats.
 

From e5a46ef45dca79c024c5920a46909d8bba09a3ae Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Sat, 9 Mar 2024 14:58:05 +0100
Subject: [PATCH 08/13] add test for --report argument and
 features.pilinfo(supported_formats)

---
 Tests/test_features.py |  7 ++++---
 Tests/test_main.py     | 12 +++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Tests/test_features.py b/Tests/test_features.py
index 3fffa032f81..3a528a7c8c6 100644
--- a/Tests/test_features.py
+++ b/Tests/test_features.py
@@ -117,9 +117,10 @@ def test_unsupported_module() -> None:
         features.version_module(module)
 
 
-def test_pilinfo() -> None:
+@pytest.mark.parametrize("supported_formats", (True, False))
+def test_pilinfo(supported_formats) -> None:
     buf = io.StringIO()
-    features.pilinfo(buf)
+    features.pilinfo(buf, supported_formats=supported_formats)
     out = buf.getvalue()
     lines = out.splitlines()
     assert lines[0] == "-" * 68
@@ -148,4 +149,4 @@ def test_pilinfo() -> None:
         + "-" * 68
         + "\n"
     )
-    assert jpeg in out
+    assert supported_formats == (jpeg in out)
diff --git a/Tests/test_main.py b/Tests/test_main.py
index e13e0c5e3ac..9ed7fa3d662 100644
--- a/Tests/test_main.py
+++ b/Tests/test_main.py
@@ -4,9 +4,15 @@
 import subprocess
 import sys
 
+import pytest
 
-def test_main() -> None:
-    out = subprocess.check_output([sys.executable, "-m", "PIL"]).decode("utf-8")
+
+@pytest.mark.parametrize("report", (False, True))
+def test_main(report) -> None:
+    args = [sys.executable, "-m", "PIL"]
+    if report:
+        args.append("--report")
+    out = subprocess.check_output(args).decode("utf-8")
     lines = out.splitlines()
     assert lines[0] == "-" * 68
     assert lines[1].startswith("Pillow ")
@@ -37,4 +43,4 @@ def test_main() -> None:
         + "-" * 68
         + os.linesep
     )
-    assert jpeg in out
+    assert report == (jpeg not in out)

From a619a8de2fd82a16b497f7512fde3dd1cc3439b1 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Sat, 9 Mar 2024 15:00:45 +0100
Subject: [PATCH 09/13] add PIL.report

---
 Tests/test_report.py | 27 +++++++++++++++++++++++++++
 src/PIL/report.py    |  5 +++++
 2 files changed, 32 insertions(+)
 create mode 100644 Tests/test_report.py
 create mode 100644 src/PIL/report.py

diff --git a/Tests/test_report.py b/Tests/test_report.py
new file mode 100644
index 00000000000..d0fc528860d
--- /dev/null
+++ b/Tests/test_report.py
@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+import subprocess
+import sys
+
+
+def test_main() -> None:
+    args = [sys.executable, "-m", "PIL.report"]
+    out = subprocess.check_output(args).decode("utf-8")
+    lines = out.splitlines()
+    assert lines[0] == "-" * 68
+    assert lines[1].startswith("Pillow ")
+    assert lines[2].startswith("Python ")
+    lines = lines[3:]
+    while lines[0].startswith("    "):
+        lines = lines[1:]
+    assert lines[0] == "-" * 68
+    assert lines[1].startswith("Python executable is")
+    lines = lines[2:]
+    if lines[0].startswith("Environment Python files loaded from"):
+        lines = lines[1:]
+    assert lines[0].startswith("System Python files loaded from")
+    assert lines[1] == "-" * 68
+    assert lines[2].startswith("Python Pillow modules loaded from ")
+    assert lines[3].startswith("Binary Pillow modules loaded from ")
+    assert lines[4] == "-" * 68
+    assert "JPEG image/jpeg" not in out
diff --git a/src/PIL/report.py b/src/PIL/report.py
new file mode 100644
index 00000000000..d2815e8455e
--- /dev/null
+++ b/src/PIL/report.py
@@ -0,0 +1,5 @@
+from __future__ import annotations
+
+from .features import pilinfo
+
+pilinfo(supported_formats=False)

From ff523e3009c4621d43072eebdc93977214d33f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Baranovi=C4=8D?= <nulano@nulano.eu>
Date: Thu, 28 Mar 2024 17:52:15 +0100
Subject: [PATCH 10/13] Update .github/ISSUE_TEMPLATE/ISSUE_REPORT.md

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/ISSUE_REPORT.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
index a895c55da0d..ea4c0e92b8e 100644
--- a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
@@ -49,9 +49,16 @@ Thank you.
 * Pillow: 
 
 ```text
-Please paste here the output of running `python3 -m PIL --report`,
-or the output of the following Python code:
+Please paste here the output of running:
 
+python3 -m PIL.report
+or
+python3 -m PIL --report
+
+Or the output of the following Python code:
+
+from PIL import report
+# or
 from PIL import features
 features.pilinfo(supported_formats=False)
 ```

From 7e71621671f552d3b61e448b67602627fd395bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Baranovi=C4=8D?= <nulano@nulano.eu>
Date: Sat, 30 Mar 2024 08:13:44 +0100
Subject: [PATCH 11/13] Update src/PIL/features.py

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
---
 src/PIL/features.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PIL/features.py b/src/PIL/features.py
index a7384a0a0e9..8a0b140049d 100644
--- a/src/PIL/features.py
+++ b/src/PIL/features.py
@@ -230,9 +230,9 @@ def pilinfo(out=None, supported_formats=True):
     """
     Prints information about this installation of Pillow.
     This function can be called with ``python3 -m PIL``.
-    It can also be called with ``python3 -m PIL --report`` to have
-    "supported_formats" set to ``False``, omitting the list of all supported image
-    file formats.
+    It can also be called with ``python3 -m PIL.report`` or ``python3 -m PIL --report``
+    to have "supported_formats" set to ``False``, omitting the list of all supported
+    image file formats.
 
     :param out:
         The output stream to print to. Defaults to ``sys.stdout`` if ``None``.

From 1ac1540fe348bb7e64f4ad4132a10f64762c5380 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 30 Mar 2024 14:22:00 +1100
Subject: [PATCH 12/13] Combined test_report.py into test_main.py

---
 Tests/test_main.py   | 11 ++++++-----
 Tests/test_report.py | 27 ---------------------------
 2 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 Tests/test_report.py

diff --git a/Tests/test_main.py b/Tests/test_main.py
index 9ed7fa3d662..5ed3ecd7a8a 100644
--- a/Tests/test_main.py
+++ b/Tests/test_main.py
@@ -7,11 +7,12 @@
 import pytest
 
 
-@pytest.mark.parametrize("report", (False, True))
-def test_main(report) -> None:
-    args = [sys.executable, "-m", "PIL"]
-    if report:
-        args.append("--report")
+@pytest.mark.parametrize(
+    "args, report",
+    ((["PIL.report"], True), (["PIL", "--report"], True), (["PIL"], False)),
+)
+def test_main(args, report) -> None:
+    args = [sys.executable, "-m"] + args
     out = subprocess.check_output(args).decode("utf-8")
     lines = out.splitlines()
     assert lines[0] == "-" * 68
diff --git a/Tests/test_report.py b/Tests/test_report.py
deleted file mode 100644
index d0fc528860d..00000000000
--- a/Tests/test_report.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from __future__ import annotations
-
-import subprocess
-import sys
-
-
-def test_main() -> None:
-    args = [sys.executable, "-m", "PIL.report"]
-    out = subprocess.check_output(args).decode("utf-8")
-    lines = out.splitlines()
-    assert lines[0] == "-" * 68
-    assert lines[1].startswith("Pillow ")
-    assert lines[2].startswith("Python ")
-    lines = lines[3:]
-    while lines[0].startswith("    "):
-        lines = lines[1:]
-    assert lines[0] == "-" * 68
-    assert lines[1].startswith("Python executable is")
-    lines = lines[2:]
-    if lines[0].startswith("Environment Python files loaded from"):
-        lines = lines[1:]
-    assert lines[0].startswith("System Python files loaded from")
-    assert lines[1] == "-" * 68
-    assert lines[2].startswith("Python Pillow modules loaded from ")
-    assert lines[3].startswith("Binary Pillow modules loaded from ")
-    assert lines[4] == "-" * 68
-    assert "JPEG image/jpeg" not in out

From 6b0a79ce5706183374bf1855ecea1adb4d5b6ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Baranovi=C4=8D?= <ondreko.tiba@gmail.com>
Date: Sat, 30 Mar 2024 08:33:14 +0100
Subject: [PATCH 13/13] sort the parameters

---
 Tests/test_main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/test_main.py b/Tests/test_main.py
index 5ed3ecd7a8a..e9e12b24a79 100644
--- a/Tests/test_main.py
+++ b/Tests/test_main.py
@@ -9,7 +9,7 @@
 
 @pytest.mark.parametrize(
     "args, report",
-    ((["PIL.report"], True), (["PIL", "--report"], True), (["PIL"], False)),
+    ((["PIL"], False), (["PIL", "--report"], True), (["PIL.report"], True)),
 )
 def test_main(args, report) -> None:
     args = [sys.executable, "-m"] + args