From c212d86af2e43397760560a96217f800239532b7 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Tue, 22 Mar 2016 09:50:18 -0400 Subject: [PATCH 1/2] Use io.BytesIO instead of io.StringIO in examples --- doc/faq/howto_faq.rst | 5 +++-- examples/misc/svg_filter_line.py | 4 ++-- examples/misc/svg_filter_pie.py | 4 ++-- examples/user_interfaces/svg_histogram.py | 4 ++-- examples/user_interfaces/svg_tooltip.py | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst index 98c71350e34..778bb45d19b 100644 --- a/doc/faq/howto_faq.rst +++ b/doc/faq/howto_faq.rst @@ -664,8 +664,9 @@ Here is an example using `Pillow `_. First, the figure is saved to a StringIO object which is then fed to Pillow for further processing:: - import StringIO, Image - imgdata = StringIO.StringIO() + from io import BytesIO + import Image + imgdata = BytesIO() fig.savefig(imgdata, format='png') imgdata.seek(0) # rewind the data im = Image.open(imgdata) diff --git a/examples/misc/svg_filter_line.py b/examples/misc/svg_filter_line.py index 48a65640338..95e6381295e 100644 --- a/examples/misc/svg_filter_line.py +++ b/examples/misc/svg_filter_line.py @@ -52,8 +52,8 @@ ax.set_ylim(0., 1.) # save the figure as a string in the svg format. -from io import StringIO -f = StringIO() +from io import BytesIO +f = BytesIO() plt.savefig(f, format="svg") diff --git a/examples/misc/svg_filter_pie.py b/examples/misc/svg_filter_pie.py index 64b76be0510..61a2719fce4 100644 --- a/examples/misc/svg_filter_pie.py +++ b/examples/misc/svg_filter_pie.py @@ -42,8 +42,8 @@ # save -from io import StringIO -f = StringIO() +from io import BytesIO +f = BytesIO() plt.savefig(f, format="svg") import xml.etree.cElementTree as ET diff --git a/examples/user_interfaces/svg_histogram.py b/examples/user_interfaces/svg_histogram.py index 51f5e147447..dd0279674bf 100755 --- a/examples/user_interfaces/svg_histogram.py +++ b/examples/user_interfaces/svg_histogram.py @@ -35,7 +35,7 @@ import numpy as np import matplotlib.pyplot as plt import xml.etree.ElementTree as ET -from io import StringIO +from io import BytesIO import json plt.rcParams['svg.embed_char_paths'] = 'none' @@ -76,7 +76,7 @@ t.set_gid('leg_text_%d' % i) # Save SVG in a fake file object. -f = StringIO() +f = BytesIO() plt.savefig(f, format="svg") # Create XML tree from the SVG file. diff --git a/examples/user_interfaces/svg_tooltip.py b/examples/user_interfaces/svg_tooltip.py index 6b647d17639..2f136156f81 100644 --- a/examples/user_interfaces/svg_tooltip.py +++ b/examples/user_interfaces/svg_tooltip.py @@ -24,7 +24,7 @@ import matplotlib.pyplot as plt import xml.etree.ElementTree as ET -from io import StringIO +from io import BytesIO ET.register_namespace("", "http://www.w3.org/2000/svg") @@ -72,7 +72,7 @@ ax.set_ylim(-30, 30) ax.set_aspect('equal') -f = StringIO() +f = BytesIO() plt.savefig(f, format="svg") # --- Add interactivity --- From 4f17dbd4da087cb503dc7914830a1b1aa589d14a Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Wed, 23 Mar 2016 15:43:05 -0400 Subject: [PATCH 2/2] Address comments in PR --- doc/faq/howto_faq.rst | 4 ++-- examples/misc/svg_filter_line.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst index 778bb45d19b..0e33c11d3f2 100644 --- a/doc/faq/howto_faq.rst +++ b/doc/faq/howto_faq.rst @@ -661,11 +661,11 @@ or by saving to a file handle:: fig.savefig(sys.stdout) Here is an example using `Pillow `_. -First, the figure is saved to a StringIO object which is then fed to +First, the figure is saved to a BytesIO object which is then fed to Pillow for further processing:: from io import BytesIO - import Image + from PIL import Image imgdata = BytesIO() fig.savefig(imgdata, format='png') imgdata.seek(0) # rewind the data diff --git a/examples/misc/svg_filter_line.py b/examples/misc/svg_filter_line.py index 95e6381295e..006ca04b6a8 100644 --- a/examples/misc/svg_filter_line.py +++ b/examples/misc/svg_filter_line.py @@ -51,7 +51,7 @@ ax.set_xlim(0., 1.) ax.set_ylim(0., 1.) -# save the figure as a string in the svg format. +# save the figure as a bytes string in the svg format. from io import BytesIO f = BytesIO() plt.savefig(f, format="svg")