[django/django] 1d1deb: [1.7.x] Added a newline to appease flake8

[GitHub]

Branch: refs/heads/stable/1.7.x
Home: https://github.com/django/django
Commit: 1d1debeed439ce4a685859537dd5c587f72d942c
https://github.com/django/django/commit/1d1debeed439ce4a685859537dd5c587f72d942c
Author: Alex Gaynor <alex....@gmail.com>
Date: 2014-07-14 (Mon, 14 Jul 2014)

Changed paths:
M django/contrib/admin/templatetags/admin_static.py

Log Message:
-----------
[1.7.x] Added a newline to appease flake8

Backport of 037f81fedc from master


Commit: 572885729e028eae2f2b823ef87543b7c66bdb10
https://github.com/django/django/commit/572885729e028eae2f2b823ef87543b7c66bdb10
Author: Anssi Kääriäinen <akaa...@gmail.com>
Date: 2014-07-14 (Mon, 14 Jul 2014)

Changed paths:
M django/db/models/options.py
M tests/admin_views/admin.py
M tests/admin_views/tests.py

Log Message:
-----------
[1.7.x] Fixed #22994 -- regression with generic FK + admin list_view

The reason for the regression was that the GenericForeignKey field isn't
something meta.get_field_by_name() should return. The reason is that a
couple of places in Django expects get_field_by_name() to work this way.
It could make sense to return GFKs from get_field_by_name(), but that
should likely be done as part of meta refactoring or virtual fields
refactoring patches.

Thanks to glic...@gmail.com for the report and to Tim for working on
the issue.


Compare: https://github.com/django/django/compare/dcb1b971c254...572885729e02