[ 2165316 ] importing pylab overwrites x

mdboom · mdboom · commit b3f4ee4f12c6 · 2008-10-15T15:55:29.000Z
[ 2163348 ] error in mathtext_examples.py
[ 2156924 ] Typo: Missing parenthesis
[ 2135925 ] API example barchart_demo.py small error

svn path=/trunk/matplotlib/; revision=6207
diff --git a/examples/api/barchart_demo.py b/examples/api/barchart_demo.py
@@ -22,7 +22,8 @@
 # add some
 ax.set_ylabel('Scores')
 ax.set_title('Scores by group and gender')
-ax.set_xticks(ind+width, ('G1', 'G2', 'G3', 'G4', 'G5') )
+ax.set_xticks(ind+width)
+ax.set_xticklabels( ('G1', 'G2', 'G3', 'G4', 'G5') )
 
 ax.legend( (rects1[0], rects2[0]), ('Men', 'Women') )
 
diff --git a/examples/pylab_examples/mathtext_examples.py b/examples/pylab_examples/mathtext_examples.py
@@ -49,7 +49,6 @@
     r'$\widehat{abc}\widetilde{def}$',
     r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
     r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
-    #ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'
     ur'Generic symbol: $\u23ce$',
    ]
 
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -898,7 +898,7 @@ def xscale(*args, **kwargs):
     draw_if_interactive()
     return ret
 xscale.__doc__ = dedent(xscale.__doc__) % {
-    'scale': ' | '.join([repr(x) for x in get_scale_names()]),
+    'scale': ' | '.join([repr(_x) for _x in get_scale_names()]),
     'scale_docs': get_scale_docs()}
 
 def yscale(*args, **kwargs):
@@ -918,7 +918,7 @@ def yscale(*args, **kwargs):
     draw_if_interactive()
     return ret
 yscale.__doc__ = dedent(yscale.__doc__) % {
-    'scale': ' | '.join([repr(x) for x in get_scale_names()]),
+    'scale': ' | '.join([repr(_x) for _x in get_scale_names()]),
     'scale_docs': get_scale_docs()}
 
 def xticks(*args, **kwargs):
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -25,7 +25,7 @@
 
   * FixedLocator    - Tick locations are fixed
 
-  * IndexLocator    - locator for index plots (eg where x = range(len(y))
+  * IndexLocator    - locator for index plots (eg. where x = range(len(y)))
 
   * LinearLocator   - evenly spaced ticks from min to max
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@`
`49`	`49`	`r'$\widehat{abc}\widetilde{def}$',`
`50`	`50`	`r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',`
`51`	`51`	`r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',`
`52`		`- #ur'Generic symbol: $\u23ce \mathrm{\ue0f2 \U0001D538}$'`
`53`	`52`	`ur'Generic symbol: $\u23ce$',`
`54`	`53`	`]`
`55`	`54`