modifications for django 1.7 and PEP8