Modernize syntax

matplotlib · Oct 26, 2015 · 4b2306d · 4b2306d
1 parent f9861ec
commit 4b2306d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -28,13 +28,13 @@
 import numpy as np
 
 from matplotlib import verbose, rcParams
-from matplotlib.backend_bases import RendererBase,\
-     FigureManagerBase, FigureCanvasBase
+from matplotlib.backend_bases import (RendererBase, FigureManagerBase,
+                                      FigureCanvasBase)
 from matplotlib.cbook import is_string_like, maxdict, restrict_dict
 from matplotlib.figure import Figure
 from matplotlib.font_manager import findfont, get_font
-from matplotlib.ft2font import LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING, \
-     LOAD_DEFAULT, LOAD_NO_AUTOHINT
+from matplotlib.ft2font import (LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING,
+                                LOAD_DEFAULT, LOAD_NO_AUTOHINT)
 from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib.transforms import Bbox, BboxBase

diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -29,23 +29,23 @@
 import matplotlib
 from matplotlib import __version__, rcParams
 from matplotlib._pylab_helpers import Gcf
-from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
-    FigureManagerBase, FigureCanvasBase
+from matplotlib.backend_bases import (RendererBase, GraphicsContextBase,
+                                      FigureManagerBase, FigureCanvasBase)
 from matplotlib.backends.backend_mixed import MixedModeRenderer
-from matplotlib.cbook import Bunch, is_string_like, \
-    get_realpath_and_stat, is_writable_file_like, maxdict
+from matplotlib.cbook import (Bunch, is_string_like, get_realpath_and_stat,
+                              is_writable_file_like, maxdict)
 from matplotlib.figure import Figure
 from matplotlib.font_manager import findfont, is_opentype_cff_font, get_font
 from matplotlib.afm import AFM
 import matplotlib.type1font as type1font
 import matplotlib.dviread as dviread
-from matplotlib.ft2font import FIXED_WIDTH, ITALIC, LOAD_NO_SCALE, \
-    LOAD_NO_HINTING, KERNING_UNFITTED
+from matplotlib.ft2font import (FIXED_WIDTH, ITALIC, LOAD_NO_SCALE,
+                                LOAD_NO_HINTING, KERNING_UNFITTED)
 from matplotlib.mathtext import MathTextParser
 from matplotlib.transforms import Affine2D, BboxBase
 from matplotlib.path import Path
 from matplotlib import _path
-from matplotlib import _png
+from matplotlib import _pngp
 from matplotlib import ttconv
 
 # Overview

diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -33,10 +33,10 @@
 import numpy as np
 
 import pyparsing
-from pyparsing import Combine, Group, Optional, Forward, \
-     Literal, OneOrMore, ZeroOrMore, ParseException, Empty, \
-     ParseResults, Suppress, oneOf, StringEnd, ParseFatalException, \
-     FollowedBy, Regex, ParserElement, QuotedString, ParseBaseException
+from pyparsing import (Combine, Group, Optional, Forward,
+     Literal, OneOrMore, ZeroOrMore, ParseException, Empty,
+     ParseResults, Suppress, oneOf, StringEnd, ParseFatalException,
+     FollowedBy, Regex, ParserElement, QuotedString, ParseBaseException)
 
 # Enable packrat parsing
 if (six.PY3 and
@@ -48,12 +48,14 @@
     ParserElement.enablePackrat()
 
 from matplotlib.afm import AFM
-from matplotlib.cbook import Bunch, get_realpath_and_stat, \
-    is_string_like, maxdict
-from matplotlib.ft2font import FT2Image, KERNING_DEFAULT, LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING
+from matplotlib.cbook import (Bunch, get_realpath_and_stat, is_string_like,
+                              maxdict)
+from matplotlib.ft2font import (FT2Image, KERNING_DEFAULT, LOAD_FORCE_AUTOHINT,
+                                LOAD_NO_HINTING)
 from matplotlib.font_manager import findfont, FontProperties, get_font
-from matplotlib._mathtext_data import latex_to_bakoma, \
-        latex_to_standard, tex2uni, latex_to_cmex, stix_virtual_fonts
+from matplotlib._mathtext_data import (latex_to_bakoma, latex_to_standard,
+                                       tex2uni, latex_to_cmex,
+                                       stix_virtual_fonts)
 from matplotlib import get_data_path, rcParams
 
 import matplotlib.colors as mcolors