lgtm.

For completeness, it looks like the flake8 error is very similar to the one noted in #7027 (comment).

I think both the Pull request would need a rebase to fix the flake8 error.

I merged #7575 and restarted the Travis flake8 build, that should get Travis green.

@lesteve The CircleCI tests are failing.

seems like there was an error in plot_multioutput_face_completion. Try rerunning the CI (One way of doing it yourself is to do git commit --amend and force push)?

Traceback (most recent call last):
  File "/home/ubuntu/scikit-learn/doc/sphinxext/gen_rst.py", line 864, in generate_file_rst
    execfile(os.path.basename(src_file), my_globals)
  File "plot_multioutput_face_completion.py", line 28, in <module>
    data = fetch_olivetti_faces()
  File "/home/ubuntu/scikit-learn/sklearn/datasets/olivetti_faces.py", line 123, in fetch_olivetti_faces
    faces = joblib.load(filepath)
  File "/home/ubuntu/scikit-learn/sklearn/externals/joblib/numpy_pickle.py", line 459, in load
    obj = unpickler.load()
  File "/home/ubuntu/miniconda/envs/testenv/lib/python2.7/pickle.py", line 864, in load
    dispatch[key](self)
KeyError: 'x'

The CircleCI error is weird, I tried to restart the build manually without cache to see whether that fixes it ...

The CircleCI error is weird, I tried to restart the build manually without cache to see whether that fixes it ...

Seems like it did ...

Is the PR ready for merging?

Is the PR ready for merging?

Thanks for reminding us about this one ! @amueller gave his +1 above and it looks good to me as well so merging this one, thanks!