Merge pull request matplotlib#10195 from anntzer/wrap-lines

Wrap a few overly long lines.

Author: jklymak

lib/matplotlib/_mathtext_data.py

@@ -2373,10 +2373,10 @@
             (0x0066, 0x0068, 'it', 0xe169),  # f-h
             (0x0069, 0x006a, 'it', 0x2148),  # i-j
             (0x006b, 0x007a, 'it', 0xe16c),  # k-z
-            (0x0393, 0x0393, 'it', 0x213e),  # \Gamma (missing in beta STIX fonts)
+            (0x0393, 0x0393, 'it', 0x213e),  # \Gamma (not in beta STIX fonts)
             (0x03a0, 0x03a0, 'it', 0x213f),  # \Pi
-            (0x03a3, 0x03a3, 'it', 0x2140),  # \Sigma (missing in beta STIX fonts)
-            (0x03b3, 0x03b3, 'it', 0x213d),  # \gamma (missing in beta STIX fonts)
+            (0x03a3, 0x03a3, 'it', 0x2140),  # \Sigma (not in beta STIX fonts)
+            (0x03b3, 0x03b3, 'it', 0x213d),  # \gamma (not in beta STIX fonts)
             (0x03c0, 0x03c0, 'it', 0x213c),  # \pi
             ],
         'bf':

lib/matplotlib/backend_bases.py

@@ -1070,7 +1070,8 @@ def set_dashes(self, dash_offset, dash_list):
         if dash_list is not None:
             dl = np.asarray(dash_list)
             if np.any(dl < 0.0):
-                raise ValueError("All values in the dash list must be positive")
+                raise ValueError(
+                    "All values in the dash list must be positive")
         self._dashes = dash_offset, dash_list
 
     def set_foreground(self, fg, isRGBA=False):
@@ -2308,7 +2309,8 @@ def get_default_filename(self):
         i = 1
         while os.path.isfile(os.path.join(save_dir, default_filename)):
             # attach numerical count to basename
-            default_filename = '{0}-{1}.{2}'.format(default_basename, i, default_filetype)
+            default_filename = (
+                '{}-{}.{}'.format(default_basename, i, default_filetype))
             i += 1
 
         return default_filename

lib/matplotlib/backends/backend_cairo.py

@@ -168,8 +168,8 @@ def draw_path(self, gc, path, transform, rgbFace=None):
         self._fill_and_stroke(
             ctx, rgbFace, gc.get_alpha(), gc.get_forced_alpha())
 
-    def draw_markers(
-            self, gc, marker_path, marker_trans, path, transform, rgbFace=None):
+    def draw_markers(self, gc, marker_path, marker_trans, path, transform,
+                     rgbFace=None):
         ctx = gc.ctx
 
         ctx.new_path()

lib/matplotlib/backends/backend_macosx.py

@@ -106,7 +106,7 @@ def resize(self, width, height):
 
     def new_timer(self, *args, **kwargs):
         """
-        Creates a new backend-specific subclass of :class:`backend_bases.Timer`.
+        Creates a new backend-specific subclass of `backend_bases.Timer`.
         This is useful for getting periodic events through the backend's native
         event loop. Implemented only for backends with GUIs.
 

lib/matplotlib/backends/backend_template.py

@@ -90,15 +90,16 @@ def draw_path(self, gc, path, transform, rgbFace=None):
     # draw_markers is optional, and we get more correct relative
     # timings by leaving it out.  backend implementers concerned with
     # performance will probably want to implement it
-#     def draw_markers(self, gc, marker_path, marker_trans, path, trans, rgbFace=None):
+#     def draw_markers(self, gc, marker_path, marker_trans, path, trans,
+#                      rgbFace=None):
 #         pass
 
     # draw_path_collection is optional, and we get more correct
     # relative timings by leaving it out. backend implementers concerned with
     # performance will probably want to implement it
 #     def draw_path_collection(self, gc, master_transform, paths,
-#                              all_transforms, offsets, offsetTrans, facecolors,
-#                              edgecolors, linewidths, linestyles,
+#                              all_transforms, offsets, offsetTrans,
+#                              facecolors, edgecolors, linewidths, linestyles,
 #                              antialiaseds):
 #         pass
 

lib/matplotlib/projections/geo.py

@@ -82,23 +82,23 @@ def _set_lim_and_transforms(self):
         # This is the transform for longitude ticks.
         self._xaxis_pretransform = \
             Affine2D() \
-            .scale(1.0, self._longitude_cap * 2.0) \
-            .translate(0.0, -self._longitude_cap)
+            .scale(1, self._longitude_cap * 2) \
+            .translate(0, -self._longitude_cap)
         self._xaxis_transform = \
             self._xaxis_pretransform + \
             self.transData
         self._xaxis_text1_transform = \
-            Affine2D().scale(1.0, 0.0) + \
+            Affine2D().scale(1, 0) + \
             self.transData + \
-            Affine2D().translate(0.0, 4.0)
+            Affine2D().translate(0, 4)
         self._xaxis_text2_transform = \
-            Affine2D().scale(1.0, 0.0) + \
+            Affine2D().scale(1, 0) + \
             self.transData + \
-            Affine2D().translate(0.0, -4.0)
+            Affine2D().translate(0, -4)
 
         # This is the transform for latitude ticks.
-        yaxis_stretch = Affine2D().scale(np.pi * 2.0, 1.0).translate(-np.pi, 0.0)
-        yaxis_space = Affine2D().scale(1.0, 1.1)
+        yaxis_stretch = Affine2D().scale(np.pi * 2, 1).translate(-np.pi, 0)
+        yaxis_space = Affine2D().scale(1, 1.1)
         self._yaxis_transform = \
             yaxis_stretch + \
             self.transData
@@ -110,15 +110,15 @@ def _set_lim_and_transforms(self):
              self.transAxes)
         self._yaxis_text1_transform = \
             yaxis_text_base + \
-            Affine2D().translate(-8.0, 0.0)
+            Affine2D().translate(-8, 0)
         self._yaxis_text2_transform = \
             yaxis_text_base + \
-            Affine2D().translate(8.0, 0.0)
+            Affine2D().translate(8, 0)
 
     def _get_affine_transform(self):
         transform = self._get_core_transform(1)
         xscale, _ = transform.transform_point((np.pi, 0))
-        _, yscale = transform.transform_point((0, np.pi / 2.0))
+        _, yscale = transform.transform_point((0, np.pi / 2))
         return Affine2D() \
             .scale(0.5 / xscale, 0.5 / yscale) \
             .translate(0.5, 0.5)
@@ -266,7 +266,8 @@ def transform_path_non_affine(self, path):
         vertices = path.vertices
         ipath = path.interpolated(self._resolution)
         return Path(self.transform(ipath.vertices), ipath.codes)
-    transform_path_non_affine.__doc__ = Transform.transform_path_non_affine.__doc__
+    transform_path_non_affine.__doc__ = \
+        Transform.transform_path_non_affine.__doc__
 
 
 class AitoffAxes(GeoAxes):
@@ -377,7 +378,8 @@ class MollweideTransform(_GeoTransform):
 
         def transform_non_affine(self, ll):
             def d(theta):
-                delta = -(theta + np.sin(theta) - pi_sin_l) / (1 + np.cos(theta))
+                delta = (-(theta + np.sin(theta) - pi_sin_l)
+                         / (1 + np.cos(theta)))
                 return delta, np.abs(delta) > 0.001
 
             longitude = ll[:, 0]

lib/matplotlib/sphinxext/plot_directive.py

@@ -598,7 +598,8 @@ def render_figures(code, code_path, output_dir, output_base, context,
         images = []
         for j in xrange(1000):
             if len(code_pieces) > 1:
-                img = ImageFile('%s_%02d_%02d' % (output_base, i, j), output_dir)
+                img = ImageFile('%s_%02d_%02d' % (output_base, i, j),
+                                output_dir)
             else:
                 img = ImageFile('%s_%02d' % (output_base, j), output_dir)
             for format, dpi in formats:
@@ -780,8 +781,8 @@ def run(arguments, content, options, state_machine, state, lineno):
     except PlotError as err:
         reporter = state.memo.reporter
         sm = reporter.system_message(
-            2, "Exception occurred in plotting %s\n from %s:\n%s" % (output_base,
-                                                source_file_name, err),
+            2, "Exception occurred in plotting {}\n from {}:\n{}".format(
+                output_base, source_file_name, err),
             line=lineno)
         results = [(code, [])]
         errors = [sm]
@@ -808,8 +809,9 @@ def run(arguments, content, options, state_machine, state, lineno):
         if nofigs:
             images = []
 
-        opts = [':%s: %s' % (key, val) for key, val in six.iteritems(options)
-                if key in ('alt', 'height', 'width', 'scale', 'align', 'class')]
+        opts = [
+            ':%s: %s' % (key, val) for key, val in six.iteritems(options)
+            if key in ('alt', 'height', 'width', 'scale', 'align', 'class')]
 
         only_html = ".. only:: html"
         only_latex = ".. only:: latex"

lib/matplotlib/testing/decorators.py

@@ -259,8 +259,10 @@ def copy_baseline(self, baseline, extension):
         orig_expected_fname = baseline_path + '.' + extension
         if extension == 'eps' and not os.path.exists(orig_expected_fname):
             orig_expected_fname = baseline_path + '.pdf'
-        expected_fname = make_test_filename(os.path.join(
-            self.result_dir, os.path.basename(orig_expected_fname)), 'expected')
+        expected_fname = make_test_filename(
+            os.path.join(self.result_dir,
+                         os.path.basename(orig_expected_fname)),
+            'expected')
         if os.path.exists(orig_expected_fname):
             shutil.copyfile(orig_expected_fname, expected_fname)
         else:
@@ -278,7 +280,8 @@ def compare(self, idx, baseline, extension):
         if self.remove_text:
             remove_ticks_and_titles(fig)
 
-        actual_fname = os.path.join(self.result_dir, baseline) + '.' + extension
+        actual_fname = (
+            os.path.join(self.result_dir, baseline) + '.' + extension)
         kwargs = self.savefig_kwargs.copy()
         if extension == 'pdf':
             kwargs.setdefault('metadata',
@@ -482,7 +485,8 @@ def _image_directories(func):
     module_name = func.__module__
     if module_name == '__main__':
         # FIXME: this won't work for nested packages in matplotlib.tests
-        warnings.warn('test module run as script. guessing baseline image locations')
+        warnings.warn(
+            'Test module run as script. Guessing baseline image locations.')
         script_name = sys.argv[0]
         basedir = os.path.abspath(os.path.dirname(script_name))
         subdir = os.path.splitext(os.path.split(script_name)[1])[0]
@@ -496,12 +500,13 @@ def _image_directories(func):
             # multiprocess plugin or as a specific test this may be
             # missing. See https://github.com/matplotlib/matplotlib/issues/3314
         if mods.pop(0) != 'tests':
-            warnings.warn(("Module '%s' does not live in a parent module "
-                "named 'tests'. This is probably ok, but we may not be able "
-                "to guess the correct subdirectory containing the baseline "
-                "images. If things go wrong please make sure that there is "
-                "a parent directory named 'tests' and that it contains a "
-                "__init__.py file (can be empty).") % module_name)
+            warnings.warn(
+                "Module {!r} does not live in a parent module named 'tests'. "
+                "This is probably ok, but we may not be able to guess the "
+                "correct subdirectory containing the baseline images. If "
+                "things go wrong please make sure that there is a parent "
+                "directory named 'tests' and that it contains a __init__.py "
+                "file (can be empty).".format(module_name))
         subdir = os.path.join(*mods)
 
         import imp

lib/matplotlib/testing/jpl_units/UnitDblConverter.py

@@ -132,7 +132,7 @@ def convert( value, unit, axis ):
          unit = UnitDblConverter.default_units( value, axis )
 
       # Convert the incoming UnitDbl value/values to float/floats
-      if isinstance( axis.axes, polar.PolarAxes ) and (value.type() == "angle"):
+      if isinstance( axis.axes, polar.PolarAxes ) and value.type() == "angle":
          # Guarantee that units are radians for polar plots.
          return value.convert( "rad" )
 

lib/matplotlib/testing/jpl_units/__init__.py

@@ -20,14 +20,14 @@
 measured where an Epoch is a specific moment in time.  Epochs are typically
 referenced as an offset from some predetermined epoch.
 
-A difference of two epochs is a Duration.  The distinction between a
-Duration and a UnitDbl of time is made because an Epoch can have different
-frames (or units).  In the case of our test Epoch class the two allowed
-frames are 'UTC' and 'ET' (Note that these are rough estimates provided for
-testing purposes and should not be used in production code where accuracy
-of time frames is desired).  As such a Duration also has a frame of
-reference and therefore needs to be called out as different that a simple
-measurement of time since a delta-t in one frame may not be the same in another.
+A difference of two epochs is a Duration.  The distinction between a Duration
+and a UnitDbl of time is made because an Epoch can have different frames (or
+units).  In the case of our test Epoch class the two allowed frames are 'UTC'
+and 'ET' (Note that these are rough estimates provided for testing purposes
+and should not be used in production code where accuracy of time frames is
+desired).  As such a Duration also has a frame of reference and therefore needs
+to be called out as different that a simple measurement of time since a delta-t
+in one frame may not be the same in another.
 """
 
 #=======================================================================