Fixed Python 2.4 compatibility. (Bug #2504)

Some of the new code changes broke compatibility with Python 2.4. This should be working much better now.

Fixed --diff-filename=- with --username and --password. (Bug #2503)

Due to a small logic error, --diff-filename=- wasn’t working when --username and --password was provided, which broke some automated setups.