Merge branch 'master' of github.com:matplotlib/matplotlib

* 'master' of github.com:matplotlib/matplotlib:
  removing items from the call to six.iteritems
  fix removed api change regarding spectral functions
  - pep8  - removed mutable default values  - foo == None -> foo is None
  pep8

Author: pelson

doc/api/api_changes.rst

@@ -76,13 +76,6 @@ original location:
     - `xycoords` -> set the units of the point location
     - `set_position()` -> `Annotation` only set location of annotation
 
-* NFFT being even is now enforced in `matplotlib.mlab.specgram`,
-  `matplotlib.mlab.psd`,  `matplotlib.mlab.csd`,
-  `matplotlib.mlab.cohere`, `matplotlib.mlab.cohere_pairs`,
-  `matplotlib.pyplot.specgram`, `matplotlib.pyplot.psd`,
-  `matplotlib.pyplot.csd`, and `matplotlib.pyplot.cohere`.  This was
-  listed as a requirement but was not actually checked.
-
 * `matplotlib.mlab.specgram`, `matplotlib.mlab.psd`,  `matplotlib.mlab.csd`,
   `matplotlib.mlab.cohere`, `matplotlib.mlab.cohere_pairs`,
   `matplotlib.pyplot.specgram`, `matplotlib.pyplot.psd`,

lib/matplotlib/backends/backend_gtk.py

@@ -832,7 +832,7 @@ def __init__ (self,
         hbox.pack_start (cbox)
 
         self.filetypes = filetypes
-        self.sorted_filetypes = list(six.iteritems(filetypes.items))
+        self.sorted_filetypes = list(six.iteritems(filetypes))
         self.sorted_filetypes.sort()
         default = 0
         for i, (ext, name) in enumerate(self.sorted_filetypes):