fixing pyplot.py generating boilerplate code to avoid unicode strings

Author: sfroid

boilerplate.py

@@ -217,6 +217,13 @@ def format_value(value):
             args.pop(0) # remove 'self' argument
             if defaults is None:
                 defaults = ()
+            else:
+                def_edited = []
+                for val in defaults:
+                    if isinstance(val, unicode):
+                        val = val.encode('ascii', 'ignore')
+                    def_edited.append(val)
+                defaults = tuple(def_edited)
 
             # How to call the wrapped function
             call = []

lib/matplotlib/pyplot.py

@@ -2599,7 +2599,7 @@ def broken_barh(xranges, yrange, hold=None, **kwargs):
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @_autogen_docstring(Axes.boxplot)
-def boxplot(x, notch=False, sym=u'b+', vert=True, whis=1.5, positions=None,
+def boxplot(x, notch=False, sym='b+', vert=True, whis=1.5, positions=None,
             widths=None, patch_artist=False, bootstrap=None, usermedians=None,
             conf_intervals=None, meanline=False, showmeans=False, showcaps=True,
             showbox=True, showfliers=True, boxprops=None, labels=None,
@@ -2631,8 +2631,8 @@ def boxplot(x, notch=False, sym=u'b+', vert=True, whis=1.5, positions=None,
 # changes will be lost
 @_autogen_docstring(Axes.cohere)
 def cohere(x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
-           window=mlab.window_hanning, noverlap=0, pad_to=None,
-           sides=u'default', scale_by_freq=None, hold=None, **kwargs):
+           window=mlab.window_hanning, noverlap=0, pad_to=None, sides='default',
+           scale_by_freq=None, hold=None, **kwargs):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
@@ -2729,7 +2729,7 @@ def csd(x, y, NFFT=None, Fs=None, Fc=None, detrend=None, window=None,
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @_autogen_docstring(Axes.errorbar)
-def errorbar(x, y, yerr=None, xerr=None, fmt=u'-', ecolor=None, elinewidth=None,
+def errorbar(x, y, yerr=None, xerr=None, fmt='-', ecolor=None, elinewidth=None,
              capsize=3, barsabove=False, lolims=False, uplims=False,
              xlolims=False, xuplims=False, errorevery=1, capthick=None,
              hold=None, **kwargs):
@@ -2754,9 +2754,9 @@ def errorbar(x, y, yerr=None, xerr=None, fmt=u'-', ecolor=None, elinewidth=None,
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @_autogen_docstring(Axes.eventplot)
-def eventplot(positions, orientation=u'horizontal', lineoffsets=1,
-              linelengths=1, linewidths=None, colors=None, linestyles=u'solid',
-              hold=None, **kwargs):
+def eventplot(positions, orientation='horizontal', lineoffsets=1, linelengths=1,
+              linewidths=None, colors=None, linestyles='solid', hold=None,
+              **kwargs):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
@@ -2832,9 +2832,9 @@ def fill_betweenx(y, x1, x2=0, where=None, hold=None, **kwargs):
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @_autogen_docstring(Axes.hexbin)
-def hexbin(x, y, C=None, gridsize=100, bins=None, xscale=u'linear',
-           yscale=u'linear', extent=None, cmap=None, norm=None, vmin=None,
-           vmax=None, alpha=None, linewidths=None, edgecolors=u'none',
+def hexbin(x, y, C=None, gridsize=100, bins=None, xscale='linear',
+           yscale='linear', extent=None, cmap=None, norm=None, vmin=None,
+           vmax=None, alpha=None, linewidths=None, edgecolors='none',
            reduce_C_function=np.mean, mincnt=None, marginals=False, hold=None,
            **kwargs):
     ax = gca()
@@ -2860,7 +2860,7 @@ def hexbin(x, y, C=None, gridsize=100, bins=None, xscale=u'linear',
 # changes will be lost
 @_autogen_docstring(Axes.hist)
 def hist(x, bins=10, range=None, normed=False, weights=None, cumulative=False,
-         bottom=None, histtype=u'bar', align=u'mid', orientation=u'vertical',
+         bottom=None, histtype='bar', align='mid', orientation='vertical',
          rwidth=None, log=False, color=None, label=None, stacked=False,
          hold=None, **kwargs):
     ax = gca()
@@ -2904,8 +2904,8 @@ def hist2d(x, y, bins=10, range=None, normed=False, weights=None, cmin=None,
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @_autogen_docstring(Axes.hlines)
-def hlines(y, xmin, xmax, colors=u'k', linestyles=u'solid', label=u'',
-           hold=None, **kwargs):
+def hlines(y, xmin, xmax, colors='k', linestyles='solid', label='', hold=None,
+           **kwargs):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
@@ -3087,7 +3087,7 @@ def plot(*args, **kwargs):
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @_autogen_docstring(Axes.plot_date)
-def plot_date(x, y, fmt=u'o', tz=None, xdate=True, ydate=False, hold=None,
+def plot_date(x, y, fmt='o', tz=None, xdate=True, ydate=False, hold=None,
               **kwargs):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
@@ -3166,7 +3166,7 @@ def quiverkey(*args, **kw):
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @_autogen_docstring(Axes.scatter)
-def scatter(x, y, s=20, c=u'b', marker=u'o', cmap=None, norm=None, vmin=None,
+def scatter(x, y, s=20, c='b', marker='o', cmap=None, norm=None, vmin=None,
             vmax=None, alpha=None, linewidths=None, verts=None, hold=None,
             **kwargs):
     ax = gca()
@@ -3304,7 +3304,7 @@ def step(x, y, *args, **kwargs):
 # changes will be lost
 @_autogen_docstring(Axes.streamplot)
 def streamplot(x, y, u, v, density=1, linewidth=None, color=None, cmap=None,
-               norm=None, arrowsize=1, arrowstyle=u'-|>', minlength=0.1,
+               norm=None, arrowsize=1, arrowstyle='-|>', minlength=0.1,
                transform=None, zorder=1, hold=None):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
@@ -3399,8 +3399,8 @@ def triplot(*args, **kwargs):
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @_autogen_docstring(Axes.vlines)
-def vlines(x, ymin, ymax, colors=u'k', linestyles=u'solid', label=u'',
-           hold=None, **kwargs):
+def vlines(x, ymin, ymax, colors='k', linestyles='solid', label='', hold=None,
+           **kwargs):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
@@ -3465,7 +3465,7 @@ def cla():
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @docstring.copy_dedent(Axes.grid)
-def grid(b=None, which=u'major', axis=u'both', **kwargs):
+def grid(b=None, which='major', axis='both', **kwargs):
     ret = gca().grid(b=b, which=which, axis=axis, **kwargs)
     draw_if_interactive()
     return ret
@@ -3513,15 +3513,15 @@ def ticklabel_format(**kwargs):
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @docstring.copy_dedent(Axes.locator_params)
-def locator_params(axis=u'both', tight=None, **kwargs):
+def locator_params(axis='both', tight=None, **kwargs):
     ret = gca().locator_params(axis=axis, tight=tight, **kwargs)
     draw_if_interactive()
     return ret
 
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @docstring.copy_dedent(Axes.tick_params)
-def tick_params(axis=u'both', **kwargs):
+def tick_params(axis='both', **kwargs):
     ret = gca().tick_params(axis=axis, **kwargs)
     draw_if_interactive()
     return ret
@@ -3537,7 +3537,7 @@ def margins(*args, **kw):
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @docstring.copy_dedent(Axes.autoscale)
-def autoscale(enable=True, axis=u'both', tight=None):
+def autoscale(enable=True, axis='both', tight=None):
     ret = gca().autoscale(enable=enable, axis=axis, tight=tight)
     draw_if_interactive()
     return ret