Some more python 3 goodness
Remove unnecessary variable
Remove a useless hasattr and rely on SERVER_EMAIL
Remove unnecessary if check