From 21337666ec4507cfb7df92b4ef744fcc78ddeb39 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 20 Sep 2023 10:27:56 +0800 Subject: [PATCH 1/2] Figure.savefig: Support uppercase file extensions (e.g., PNG, PDF) --- pygmt/figure.py | 2 +- pygmt/tests/test_figure.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pygmt/figure.py b/pygmt/figure.py index 1f44e0b4ad8..f8b631e7102 100644 --- a/pygmt/figure.py +++ b/pygmt/figure.py @@ -306,7 +306,7 @@ def savefig( fname = Path(fname) prefix, suffix = fname.with_suffix("").as_posix(), fname.suffix - ext = suffix[1:] # Remove the . + ext = suffix[1:].lower() # Remove the . and normalize to lowercase # alias jpeg to jpg if ext == "jpeg": ext = "jpg" diff --git a/pygmt/tests/test_figure.py b/pygmt/tests/test_figure.py index d895c08785d..713e5ff4f18 100644 --- a/pygmt/tests/test_figure.py +++ b/pygmt/tests/test_figure.py @@ -83,7 +83,7 @@ def test_figure_savefig_exists(): fig = Figure() fig.basemap(region="10/70/-300/800", projection="X3i/5i", frame="af") prefix = "test_figure_savefig_exists" - for fmt in "png pdf jpg jpeg bmp eps tif".split(): + for fmt in "png pdf jpg jpeg bmp eps tif PNG JPG JPEG Png".split(): fname = ".".join([prefix, fmt]) fig.savefig(fname) assert os.path.exists(fname) From 2ac0e6e77df49cc0f205d4af296d88dddb40687c Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 20 Sep 2023 18:17:43 +0800 Subject: [PATCH 2/2] Replace os.path with pathlib --- pygmt/tests/test_figure.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pygmt/tests/test_figure.py b/pygmt/tests/test_figure.py index 713e5ff4f18..f01df85f942 100644 --- a/pygmt/tests/test_figure.py +++ b/pygmt/tests/test_figure.py @@ -86,8 +86,10 @@ def test_figure_savefig_exists(): for fmt in "png pdf jpg jpeg bmp eps tif PNG JPG JPEG Png".split(): fname = ".".join([prefix, fmt]) fig.savefig(fname) - assert os.path.exists(fname) - os.remove(fname) + + fname = Path(fname) + assert fname.exists() + fname.unlink() def test_figure_savefig_directory_nonexists():