Made changes as recommended

thoo · thoo · commit 2f59110fd50f · 2018-10-22T19:12:33.000-04:00
diff --git a/examples/lines_bars_and_markers/linestyles.py b/examples/lines_bars_and_markers/linestyles.py
@@ -3,12 +3,11 @@
 Linestyles
 ==========
 
-This example showcases different linestyles copying those of Tikz/PGF.
-Linestyle can be provided as simple as *solid* , *dotted* or *dashed*.
-Moreover, the dashing of the line can be controlled by a dash tuple
-such as (offset, (on_off_seq)) as mentioned in `.Line2D.set_linestyle`.
-For e.g., ``(0, (3, 10, 1, 15))`` means 3pt-line,10pt-space,1pt-line,15pt-space
-with no offset.
+Linestyle can be provided as simple as *solid* , *dotted*, *dashed*
+or *dashdot*. Moreover, the dashing of the line can be controlled by
+a dash tuple such as (offset, (on_off_seq)) as mentioned in
+`.Line2D.set_linestyle`. For e.g., ``(0, (3, 10, 1, 15))`` means
+ 3pt-line,10pt-space,1pt-line,15pt-space with no offset.
 
 *Note*: The dash style can also be configured via `.Line2D.set_dashes`
 as shown in :doc:`/gallery/lines_bars_and_markers/line_demo_dash_control`
@@ -21,37 +20,34 @@
 from matplotlib.transforms import blended_transform_factory
 
 linestyles = [
-     ('solid',               ('-')),     # Same as (0, ())
-     ('dotted',              (':')),     # Same as (0, (1, 1))
-     ('dashed',              ('--')),
-     ('dashdot',             ('-.')),
+     ('solid',                 ('solid')),    # Same as (0, ()) or '-'
+     ('dotted',                ('dotted')),   # Same as (0, (1, 1)) or '.'
+     ('dashed',                ('dashed')),   # Same as '--'
+     ('dashdot',               ('dashdot')),  # Same as '-.'
 
-     ('loosely dotted',      (0, (1, 10))),
-     ('densely dotted',      (0, (1, 1))),
+     ('loosely dotted',        (0, (1, 10))),
+     ('densely dotted',        (0, (1, 1))),
 
-     ('loosely dashed',      (0, (5, 10))),
-     ('densely dashed',      (0, (5, 1))),
+     ('loosely dashed',        (0, (5, 10))),
+     ('densely dashed',        (0, (5, 1))),
 
-     ('loosely dashdotted',  (0, (3, 10, 1, 10))),
-     ('densely dashdotted',  (0, (3, 1, 1, 1))),
+     ('loosely dashdotted',    (0, (3, 10, 1, 10))),
+     ('densely dashdotted',    (0, (3, 1, 1, 1))),
 
-     ('dashdotdotted',       (0, (3, 5, 1, 5, 1, 5))),
+     ('dashdotdotted',         (0, (3, 5, 1, 5, 1, 5))),
      ('loosely dashdotdotted', (0, (3, 10, 1, 10, 1, 10))),
      ('densely dashdotdotted', (0, (3, 1, 1, 1, 1, 1)))]
 
 # Reverse the list so that plots and linestyles are in same order.
 linestyles = OrderedDict(linestyles[::-1])
-
-plt.figure(figsize=(10, 6))
-ax = plt.subplot(1, 1, 1)
-
 X, Y = np.linspace(0, 100, 10), np.zeros(10)
+
+fig, ax = plt.subplots(figsize=(10, 6))
 for i, (name, linestyle) in enumerate(linestyles.items()):
     ax.plot(X, Y+i, linestyle=linestyle, linewidth=1.5, color='black')
 
-ax.set_ylim(-0.5, len(linestyles)-0.5)
-plt.yticks(np.arange(len(linestyles)), linestyles.keys())
-plt.xticks([])
+ax.set(xticks=[], ylim=(-0.5, len(linestyles)-0.5),
+       yticks=np.arange(len(linestyles)), yticklabels=linestyles.keys())
 
 # For each line style, add a text annotation with a small offset from
 # the reference point (0 in Axes coords, y tick value in Data coords).
