PEP8 fixes

- Specify the type of exception expected from winreg.
- Fix E128 continuation line under-indented for visual indent
  by removing double brackets added in
  Ia0edaf1b30b27d424d2b3fc2fd0fd827947dd72d

Change-Id: Ic6af11ab8db95b1d6f74d5d06ed7b58169d1d6bf
Merge "PEP8 fixes"