Fixed #21270 -- Fixed E701 pep8 warnings

I ran the test suite after fixing all the E701 warnings, but there were some skipped tests because of the db backend. 

```
Ran 6149 tests in 276.349s

OK (skipped=476, expected failures=8)
```