Replaced a hardcoded "2" with the right named constant
Merge pull request #1849 from brabadu/master

Fixed flake8 E241
More attacking E302 violators
Fixed #14511 -- bug in .exclude() query
Fixed syntax error in queries/tests.py