Discogs API no longer uses generators - update this in the tests.
Minor style tweaks from flake8.