matplotlib · dstansby · Feb 19, 2018 · Feb 19, 2018
diff --git a/examples/api/custom_index_formatter.py b/examples/api/custom_index_formatter.py
@@ -7,7 +7,6 @@
 to leave out days on which there is no data, i.e. weekends.  The example
 below shows how to use an 'index formatter' to achieve the desired plot
 """
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.cbook as cbook

diff --git a/examples/api/custom_projection_example.py b/examples/api/custom_projection_example.py
@@ -3,13 +3,9 @@
 Custom projection
 =================
 
-Showcase Hammer projection by alleviating many features of
-matplotlib.
+Showcase Hammer projection by alleviating many features of Matplotlib.
 """
 
-
-from __future__ import unicode_literals
-
 import matplotlib
 from matplotlib.axes import Axes
 from matplotlib.patches import Circle

diff --git a/examples/api/custom_scale_example.py b/examples/api/custom_scale_example.py
@@ -3,13 +3,10 @@
 Custom scale
 ============
 
-Create a custom scale, by implementing the
-scaling use for latitude data in a Mercator Projection.
+Create a custom scale, by implementing the scaling use for latitude data in a
+Mercator Projection.
 """
 
-
-from __future__ import unicode_literals
-
 import numpy as np
 from numpy import ma
 from matplotlib import scale as mscale

diff --git a/examples/api/engineering_formatter.py b/examples/api/engineering_formatter.py
@@ -35,7 +35,7 @@
 # `sep` (separator between the number and the prefix/unit).
 ax1.set_title('SI-prefix only ticklabels, 1-digit precision & '
               'thin space separator')
-formatter1 = EngFormatter(places=1, sep=u"\N{THIN SPACE}")  # U+2009
+formatter1 = EngFormatter(places=1, sep="\N{THIN SPACE}")  # U+2009
 ax1.xaxis.set_major_formatter(formatter1)
 ax1.plot(xs, ys)
 ax1.set_xlabel('Frequency [Hz]')

diff --git a/examples/api/filled_step.py b/examples/api/filled_step.py
@@ -14,7 +14,6 @@
 import matplotlib.pyplot as plt
 import matplotlib.ticker as mticker
 from cycler import cycler
-from six.moves import zip
 
 
 def filled_hist(ax, edges, values, bottoms=None, orientation='v',
@@ -150,8 +149,8 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
             labels = itertools.repeat(None)
 
     if label_data:
-        loop_iter = enumerate((stacked_data[lab], lab, s) for lab, s in
-                              zip(labels, sty_cycle))
+        loop_iter = enumerate((stacked_data[lab], lab, s)
+                              for lab, s in zip(labels, sty_cycle))
     else:
         loop_iter = enumerate(zip(stacked_data, labels, sty_cycle))
 

diff --git a/examples/api/skewt.py b/examples/api/skewt.py
@@ -180,10 +180,10 @@ def upper_xlim(self):
 
 if __name__ == '__main__':
     # Now make a simple example using the custom projection.
+    from io import StringIO
     from matplotlib.ticker import (MultipleLocator, NullFormatter,
                                    ScalarFormatter)
     import matplotlib.pyplot as plt
-    from six import StringIO
     import numpy as np
 
     # Some examples data

diff --git a/examples/api/watermark_image.py b/examples/api/watermark_image.py
@@ -5,7 +5,6 @@
 
 Use a PNG file as a watermark
 """
-from __future__ import print_function
 import numpy as np
 import matplotlib.cbook as cbook
 import matplotlib.image as image

diff --git a/examples/color/named_colors.py b/examples/color/named_colors.py
@@ -5,7 +5,6 @@
 
 Simple plot example with the named colors and its visual representation.
 """
-from __future__ import division
 
 import matplotlib.pyplot as plt
 from matplotlib import colors as mcolors

diff --git a/examples/event_handling/close_event.py b/examples/event_handling/close_event.py
@@ -5,7 +5,6 @@
 
 Example to show connecting events that occur when the figure closes.
 """
-from __future__ import print_function
 import matplotlib.pyplot as plt
 
 

diff --git a/examples/event_handling/coords_demo.py b/examples/event_handling/coords_demo.py
@@ -6,7 +6,6 @@
 An example of how to interact with the plotting canvas by connecting
 to move and click events
 """
-from __future__ import print_function
 import sys
 import matplotlib.pyplot as plt
 import numpy as np

diff --git a/examples/event_handling/figure_axes_enter_leave.py b/examples/event_handling/figure_axes_enter_leave.py
@@ -6,7 +6,6 @@
 Illustrate the figure and axes enter and leave events by changing the
 frame colors on enter and leave
 """
-from __future__ import print_function
 import matplotlib.pyplot as plt
 
 

diff --git a/examples/event_handling/ginput_demo_sgskip.py b/examples/event_handling/ginput_demo_sgskip.py
@@ -7,7 +7,6 @@
 
 """
 
-from __future__ import print_function
 
 import matplotlib.pyplot as plt
 import numpy as np

diff --git a/examples/event_handling/ginput_manual_clabel_sgskip.py b/examples/event_handling/ginput_manual_clabel_sgskip.py
@@ -14,7 +14,6 @@
 
 """
 
-from __future__ import print_function
 
 import time
 import matplotlib

diff --git a/examples/event_handling/image_slices_viewer.py b/examples/event_handling/image_slices_viewer.py
@@ -5,7 +5,6 @@
 
 Scroll through 2D image slices of a 3D array.
 """
-from __future__ import print_function
 
 import numpy as np
 import matplotlib.pyplot as plt

diff --git a/examples/event_handling/keypress_demo.py b/examples/event_handling/keypress_demo.py
@@ -5,7 +5,6 @@
 
 Show how to connect to keypress events
 """
-from __future__ import print_function
 import sys
 import numpy as np
 import matplotlib.pyplot as plt

diff --git a/examples/event_handling/pick_event_demo.py b/examples/event_handling/pick_event_demo.py
@@ -66,7 +66,6 @@ def pick_handler(event):
 The examples below illustrate each of these methods.
 """
 
-from __future__ import print_function
 import matplotlib.pyplot as plt
 from matplotlib.lines import Line2D
 from matplotlib.patches import Rectangle

diff --git a/examples/event_handling/pipong.py b/examples/event_handling/pipong.py
@@ -8,7 +8,6 @@
 pipong.py was written by Paul Ivanov <http://pirsquared.org>
 """
 
-from __future__ import print_function
 
 import numpy as np
 import matplotlib.pyplot as plt

diff --git a/examples/event_handling/pong_sgskip.py b/examples/event_handling/pong_sgskip.py
@@ -10,7 +10,6 @@
    This example requires :download:`pipong.py <pipong.py>`
 
 """
-from __future__ import print_function, division
 import time
 
 

diff --git a/examples/images_contours_and_fields/image_demo.py b/examples/images_contours_and_fields/image_demo.py
@@ -10,7 +10,6 @@
 functionality of imshow and the many images you can create.
 
 """
-from __future__ import print_function
 
 import numpy as np
 import matplotlib.cm as cm

diff --git a/examples/images_contours_and_fields/layer_images.py b/examples/images_contours_and_fields/layer_images.py
@@ -5,7 +5,6 @@
 
 Layer images above one another using alpha blending
 """
-from __future__ import division
 import matplotlib.pyplot as plt
 import numpy as np
 

diff --git a/examples/lines_bars_and_markers/marker_reference.py b/examples/lines_bars_and_markers/marker_reference.py
@@ -5,7 +5,7 @@
 
 Reference for filled- and unfilled-marker types included with Matplotlib.
 """
-from six import iteritems
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.lines import Line2D
@@ -36,9 +36,7 @@ def split_list(a_list):
 fig, axes = plt.subplots(ncols=2)
 
 # Filter out filled markers and marker settings that do nothing.
-# We use iteritems from six to make sure that we get an iterator
-# in both python 2 and 3
-unfilled_markers = [m for m, func in iteritems(Line2D.markers)
+unfilled_markers = [m for m, func in Line2D.markers.items()
                     if func != 'nothing' and m not in Line2D.filled_markers]
 # Reverse-sort for pretty. We use our own sort key which is essentially
 # a python3 compatible reimplementation of python2 sort.

diff --git a/examples/lines_bars_and_markers/markevery_demo.py b/examples/lines_bars_and_markers/markevery_demo.py
@@ -20,7 +20,6 @@
 
 """
 
-from __future__ import division
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.gridspec as gridspec

diff --git a/examples/misc/cursor_demo_sgskip.py b/examples/misc/cursor_demo_sgskip.py
@@ -16,7 +16,6 @@
     https://github.com/joferkington/mpldatacursor
     https://github.com/anntzer/mplcursors
 """
-from __future__ import print_function
 import matplotlib.pyplot as plt
 import numpy as np
 

diff --git a/examples/misc/font_indexing.py b/examples/misc/font_indexing.py
@@ -7,7 +7,6 @@
 tables relate to one another.  Mainly for mpl developers....
 
 """
-from __future__ import print_function
 import matplotlib
 from matplotlib.ft2font import FT2Font, KERNING_DEFAULT, KERNING_UNFITTED, KERNING_UNSCALED
 

diff --git a/examples/misc/ftface_props.py b/examples/misc/ftface_props.py
@@ -8,7 +8,6 @@
 individual character metrics, use the Glyph object, as returned by
 load_char
 """
-from __future__ import print_function
 import matplotlib
 import matplotlib.ft2font as ft
 

diff --git a/examples/misc/image_thumbnail_sgskip.py b/examples/misc/image_thumbnail_sgskip.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import print_function
 # build thumbnails of all images in a directory
 import sys
 import os

diff --git a/examples/misc/load_converter.py b/examples/misc/load_converter.py
@@ -4,7 +4,6 @@
 ==============
 
 """
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.cbook as cbook

diff --git a/examples/misc/multiprocess_sgskip.py b/examples/misc/multiprocess_sgskip.py
@@ -8,7 +8,6 @@
 
 Written by Robert Cimrman
 """
-from __future__ import print_function
 
 import time
 import numpy as np

diff --git a/examples/misc/print_stdout_sgskip.py b/examples/misc/print_stdout_sgskip.py
@@ -15,8 +15,4 @@
 import matplotlib.pyplot as plt
 
 plt.plot([1, 2, 3])
-
-if sys.version_info[0] >= 3:
-    plt.savefig(sys.stdout.buffer)
-else:
-    plt.savefig(sys.stdout)
+plt.savefig(sys.stdout.buffer)
diff --git a/examples/misc/set_and_get.py b/examples/misc/set_and_get.py
@@ -67,7 +67,6 @@
 these properties will be listed as 'fullname or aliasname'.
 """
 
-from __future__ import print_function
 
 import matplotlib.pyplot as plt
 import numpy as np

diff --git a/examples/misc/svg_filter_line.py b/examples/misc/svg_filter_line.py
@@ -9,7 +9,6 @@
 support it.
 """
 
-from __future__ import print_function
 
 import matplotlib.pyplot as plt
 import matplotlib.transforms as mtransforms

diff --git a/examples/misc/tight_bbox_test.py b/examples/misc/tight_bbox_test.py
@@ -4,7 +4,6 @@
 ===============
 
 """
-from __future__ import print_function
 import matplotlib.pyplot as plt
 import numpy as np
 

diff --git a/examples/mplot3d/wire3d_animation.py b/examples/mplot3d/wire3d_animation.py
@@ -6,7 +6,6 @@
 A very simple 'animation' of a 3D plot.  See also rotate_axes3d_demo.
 """
 
-from __future__ import print_function
 
 from mpl_toolkits.mplot3d import axes3d
 import matplotlib.pyplot as plt

diff --git a/examples/pyplots/text_commands.py b/examples/pyplots/text_commands.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 =============
 Text Commands

diff --git a/examples/specialty_plots/anscombe.py b/examples/specialty_plots/anscombe.py
@@ -4,7 +4,6 @@
 ==================
 
 """
-from __future__ import print_function
 """
 Edward Tufte uses this example from Anscombe to show 4 datasets of x
 and y that have the same mean, standard deviation, and regression

diff --git a/examples/specialty_plots/mri_with_eeg.py b/examples/specialty_plots/mri_with_eeg.py
@@ -7,7 +7,6 @@
 histogram and some EEG traces.
 """
 
-from __future__ import division, print_function
 
 import numpy as np
 import matplotlib.pyplot as plt

diff --git a/examples/tests/backend_driver_sgskip.py b/examples/tests/backend_driver_sgskip.py
@@ -21,7 +21,6 @@
 switches with a --.
 """
 
-from __future__ import print_function, division
 import os
 import time
 import sys
@@ -383,16 +382,12 @@ def drive(backend, directories, python=['python'], switches=[]):
         tmpfile_name = '_tmp_%s.py' % basename
         tmpfile = open(tmpfile_name, 'w')
 
-        future_imports = 'from __future__ import division, print_function'
         for line in open(fullpath):
             line_lstrip = line.lstrip()
             if line_lstrip.startswith("#"):
                 tmpfile.write(line)
-            elif 'unicode_literals' in line:
-                future_imports = future_imports + ', unicode_literals'
 
         tmpfile.writelines((
-            future_imports + '\n',
             'import sys\n',
             'sys.path.append("%s")\n' % fpath.replace('\\', '\\\\'),
             'import matplotlib\n',
@@ -402,11 +397,7 @@ def drive(backend, directories, python=['python'], switches=[]):
             'numpy.seterr(invalid="ignore")\n',
             ))
         for line in open(fullpath):
-            line_lstrip = line.lstrip()
-            if (line_lstrip.startswith('from __future__ import') or
-                    line_lstrip.startswith('matplotlib.use') or
-                    line_lstrip.startswith('savefig') or
-                    line_lstrip.startswith('show')):
+            if line.lstrip().startswith(('matplotlib.use', 'savefig', 'show')):
                 continue
             tmpfile.write(line)
         if backend in rcsetup.interactive_bk:

diff --git a/examples/text_labels_and_annotations/accented_text.py b/examples/text_labels_and_annotations/accented_text.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 r"""
 =================================
 Using accented text in matplotlib
@@ -13,7 +12,6 @@
 \^y
 
 """
-from __future__ import unicode_literals
 import matplotlib.pyplot as plt
 
 # Mathtext demo

diff --git a/examples/text_labels_and_annotations/font_table_ttf_sgskip.py b/examples/text_labels_and_annotations/font_table_ttf_sgskip.py
@@ -19,9 +19,6 @@
 from matplotlib.font_manager import FontProperties
 import matplotlib.pyplot as plt
 
-import six
-from six import unichr
-
 # the font table grid
 
 labelc = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
@@ -47,7 +44,7 @@
     if ccode >= 256:
         continue
     r, c = divmod(ccode, 16)
-    s = unichr(ccode)
+    s = chr(ccode)
     chars[r][c] = s
 
 lightgrn = (0.5, 0.8, 0.5)
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
     Example to show connecting events that occur when the figure closes.
     """
-    from __future__ import print_function
     import matplotlib.pyplot as plt
@@ Expand Down @@