Merge pull request #6868 from jenshnielsen/buildmiscexamples

tacaswell · web-flow · commit 70e7a6c4e9c5 · 2016-08-07T05:04:42.000-04:00
DOC: Build misc examples
diff --git a/doc/conf.py b/doc/conf.py
@@ -138,6 +138,7 @@
     ('axes_grid', 'axes_grid toolkit'),
     ('units', 'units'),
     ('widgets', 'widgets'),
+    ('misc', 'Miscellaneous examples'),
     ]
 
 
diff --git a/examples/misc/image_thumbnail.py b/examples/misc/image_thumbnail.py
@@ -1,3 +1,4 @@
+# -*- noplot -*-
 """
 You can use matplotlib to generate thumbnails from existing images.
 matplotlib natively supports PNG files on the input side, and other
diff --git a/examples/misc/longshort.py b/examples/misc/longshort.py
@@ -3,18 +3,18 @@
 csv file, computing the daily returns, appending the results to the
 record arrays, joining on date
 """
-import urllib
+from six.moves import urllib
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.mlab as mlab
 
 # grab the price data off yahoo
-u1 = urllib.urlretrieve('http://ichart.finance.yahoo.com/table.csv?s=AAPL&d=9&e=14&f=2008&g=d&a=8&b=7&c=1984&ignore=.csv')
-u2 = urllib.urlretrieve('http://ichart.finance.yahoo.com/table.csv?s=GOOG&d=9&e=14&f=2008&g=d&a=8&b=7&c=1984&ignore=.csv')
+u1 = urllib.request.urlretrieve('http://ichart.finance.yahoo.com/table.csv?s=AAPL&d=9&e=14&f=2008&g=d&a=8&b=7&c=1984&ignore=.csv')
+u2 = urllib.request.urlretrieve('http://ichart.finance.yahoo.com/table.csv?s=GOOG&d=9&e=14&f=2008&g=d&a=8&b=7&c=1984&ignore=.csv')
 
 # load the CSV files into record arrays
-r1 = mlab.csv2rec(file(u1[0]))
-r2 = mlab.csv2rec(file(u2[0]))
+r1 = mlab.csv2rec(open(u1[0]))
+r2 = mlab.csv2rec(open(u2[0]))
 
 # compute the daily returns and add these columns to the arrays
 gains1 = np.zeros_like(r1.adj_close)
diff --git a/examples/misc/multiprocess.py b/examples/misc/multiprocess.py
@@ -1,3 +1,4 @@
+# -*- noplot -*-
 # Demo of using multiprocessing for generating data in one process and plotting
 # in another.
 # Written by Robert Cimrman
diff --git a/examples/misc/rc_traits.py b/examples/misc/rc_traits.py
@@ -1,3 +1,4 @@
+# -*- noplot -*-
 # Here is some example code showing how to define some representative
 # rc properties and construct a matplotlib artist using traits.
 # matplotlib does not ship with enthought.traits, so you will need to
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2387,8 +2387,10 @@ def rec_append_fields(rec, names, arrs, dtypes=None):
             dtypes = dtypes * len(arrs)
         else:
             raise ValueError("dtypes must be None, a single dtype or a list")
-
-    newdtype = np.dtype(rec.dtype.descr + list(zip(names, dtypes)))
+    old_dtypes = rec.dtype.descr
+    if six.PY2:
+        old_dtypes = [(name.encode('utf-8'), dt) for name, dt in old_dtypes]
+    newdtype = np.dtype(old_dtypes + list(zip(names, dtypes)))
     newrec = np.recarray(rec.shape, dtype=newdtype)
     for field in rec.dtype.fields:
         newrec[field] = rec[field]
@@ -2596,8 +2598,10 @@ def mapped_r2field(name):
               if desc[0] not in key]
     r2desc = [(mapped_r2field(desc[0]), desc[1]) for desc in r2.dtype.descr
               if desc[0] not in key]
-    newdtype = np.dtype(keydesc + r1desc + r2desc)
-
+    all_dtypes = keydesc + r1desc + r2desc
+    if six.PY2:
+        all_dtypes = [(name.encode('utf-8'), dt) for name, dt in all_dtypes]
+    newdtype = np.dtype(all_dtypes)
     newrec = np.recarray((common_len + left_len + right_len,), dtype=newdtype)
 
     if defaults is not None:
@@ -2613,7 +2617,7 @@ def mapped_r2field(name):
 
     if jointype != 'inner' and defaults is not None:
         # fill in the defaults enmasse
-        newrec_fields = list(six.iterkeys(newrec.dtype.fields.keys))
+        newrec_fields = list(six.iterkeys(newrec.dtype.fields))
         for k, v in six.iteritems(defaults):
             if k in newrec_fields:
                 newrec[k] = v

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@`
`138`	`138`	`('axes_grid', 'axes_grid toolkit'),`
`139`	`139`	`('units', 'units'),`
`140`	`140`	`('widgets', 'widgets'),`
	`141`	`+ ('misc', 'Miscellaneous examples'),`
`141`	`142`	`]`
`142`	`143`
`143`	`144`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- noplot --`
`1`	`2`	`"""`
`2`	`3`	`You can use matplotlib to generate thumbnails from existing images.`
`3`	`4`	`matplotlib natively supports PNG files on the input side, and other`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- noplot --`
`1`	`2`	`# Demo of using multiprocessing for generating data in one process and plotting`
`2`	`3`	`# in another.`
`3`	`4`	`# Written by Robert Cimrman`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- noplot --`
`1`	`2`	`# Here is some example code showing how to define some representative`
`2`	`3`	`# rc properties and construct a matplotlib artist using traits.`
`3`	`4`	`# matplotlib does not ship with enthought.traits, so you will need to`