From cb372288fe2e4060cf1d1a0080039915bb149d80 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Sat, 15 Oct 2022 11:52:17 +0200
Subject: [PATCH] Backport PR #24167: FIX: turn off layout engine tightbbox

---
 lib/matplotlib/backend_bases.py                  |   2 +-
 .../test_bbox_tight/bbox_inches_fixed_aspect.png | Bin 0 -> 5293 bytes
 lib/matplotlib/tests/test_bbox_tight.py          |  10 ++++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_fixed_aspect.png

diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
index bb17950b03f7..6e603cafbef0 100644
--- a/lib/matplotlib/backend_bases.py
+++ b/lib/matplotlib/backend_bases.py
@@ -2330,7 +2330,7 @@ def print_figure(
                 _bbox_inches_restore = None
 
             # we have already done layout above, so turn it off:
-            stack.enter_context(self.figure._cm_set(layout_engine=None))
+            stack.enter_context(self.figure._cm_set(layout_engine='none'))
             try:
                 # _get_renderer may change the figure dpi (as vector formats
                 # force the figure dpi to 72), so we need to set it again here.
diff --git a/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_fixed_aspect.png b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_fixed_aspect.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fd7a35e3303ba3de632aec6a5a6bb65ca9d86bb
GIT binary patch
literal 5293
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

literal 0
HcmV?d00001

diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py
index 1a7ba6b7456c..91ff7fe20963 100644
--- a/lib/matplotlib/tests/test_bbox_tight.py
+++ b/lib/matplotlib/tests/test_bbox_tight.py
@@ -146,3 +146,13 @@ def test_noop_tight_bbox():
     assert (im[:, :, 3] == 255).all()
     assert not (im[:, :, :3] == 255).all()
     assert im.shape == (7, 10, 4)
+
+
+@image_comparison(['bbox_inches_fixed_aspect'], extensions=['png'],
+                  remove_text=True, savefig_kwarg={'bbox_inches': 'tight'})
+def test_bbox_inches_fixed_aspect():
+    with plt.rc_context({'figure.constrained_layout.use': True}):
+        fig, ax = plt.subplots()
+        ax.plot([0, 1])
+        ax.set_xlim(0, 1)
+        ax.set_aspect('equal')

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/matplotlib/matplotlib/pull/24176.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/matplotlib/matplotlib/pull/24176.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/matplotlib/matplotlib/pull/24176.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/matplotlib/matplotlib/pull/24176.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>