calcs, engine:

Pyflakes fixes. One of the issues in the `engine` module is an actual
bug.
Merge pull request #1260 from larsbutler/pyflakes-fixes

Pyflakes fixes to the calculators and engine module

[r=micheles] [f=*trivial]