Merge pull request #1854 from rayashmanjr/master

Correct flake8 E302 violations
Fixed the remaining E302 violations int eh django package
Fixing E302 Errors

Signed-off-by: Jason Myers <jason@jasonamyers.com>
Fixed all E261 warnings
PEP8

Signed-off-by: Jason Myers <jason@jasonamyers.com>
Correct flake8 E302 violations
Revert change to django/test/_doctest.py
Checkout prior commit of _doctest.py
Fixed the remaining E302 violations int eh django package
PEP8 cleanup

Signed-off-by: Jason Myers <jason@jasonamyers.com>
Merging Upstream

Signed-off-by: Jason Myers <jason@jasonamyers.com>
Merge pull request #1853 from loic/dst

Fixed failing test around DST change.
Fixed #14170 -- Reset i18n cache when settings change
Re-expose Count here
Whitespace fix
Fixed flake8 E251 violations
Fixed #20849 -- ModelForms do not work well with prefetch_related.

model_to_dict() (used when rendering forms) queries the database
to get the list of primary keys for ManyToMany fields. This is
unnecessary if the field queryset has been prefetched, all the
keys are already in memory and can be obtained with a simple
iteration.
Fixed regressions from 36ded01527b690b5df0574492af9cfcc2ea3d1dc.

Refs #21302
Fixed some testfailures on jenkins.

Depending on the order of the tests beeing run, 10 can be a valid pk,
0 can never be a valid pk and as such we will get the wanted ValidationError.
Merging in master

Signed-off-by: Jason Myers <jason@jasonamyers.com>