pep8-ified config2.py

Note: test for variables was adapted slightly to prevent
E721 / do not compare types, use ‘isinstance()’ from triggering.
Instead of comparing the old type with type(None), the old *value*
is compared to None instead. This is also a nicer check conceptually.

Change-Id: Ibdfc17e86814a905e212bd454deba36c7995df4f