8.0 migration + PEP8 cleanup; doesn't consider website_sale compatibilit...

...y for now