Merge pull request #6577 from anntzer/fix-mlab-rec-join

tacaswell · web-flow · commit 0d33b1f8a974 · 2016-06-19T17:58:55.000-04:00
Fix mlab.rec_join.
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2611,7 +2611,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
