diff options
| author | Andriy Sokolovskiy <me@asokolovskiy.com> | 2015-06-29 23:29:18 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-08-13 13:12:52 -0400 |
| commit | d5e3eb986d590e7e781e82e8199eb3ca6af62161 (patch) | |
| tree | e367e6d68af50d9644b2715270bda68b56d28f74 | |
| parent | 312abecefd795775cb06b08b3eafe3e1f3f1ceef (diff) | |
[1.8.x] Removed unreachable code
Backport of 4359be023be3f5e5a1d1d89bf8f193d15f49b7a4 from master
| -rw-r--r-- | django/contrib/admin/checks.py | 9 | ||||
| -rw-r--r-- | django/template/loader.py | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py index 663138ced0..2caf82a7ef 100644 --- a/django/contrib/admin/checks.py +++ b/django/contrib/admin/checks.py @@ -776,15 +776,6 @@ class ModelAdminChecks(BaseModelAdminChecks): if field_name not in cls.list_display: return refer_to_missing_field(field=field_name, option=label, model=model, obj=cls, id='admin.E122') - - checks.Error( - "The value of '%s' refers to '%s', which is not contained in 'list_display'." % ( - label, field_name - ), - hint=None, - obj=cls, - id='admin.E122', - ), elif cls.list_display_links and field_name in cls.list_display_links: return [ checks.Error( diff --git a/django/template/loader.py b/django/template/loader.py index 90397d9540..ef529c93bd 100644 --- a/django/template/loader.py +++ b/django/template/loader.py @@ -110,7 +110,6 @@ def render_to_string(template_name, context=None, raise ValueError( "render_to_string doesn't support the request argument " "when some deprecated arguments are passed.") - continue # Hack -- use the internal Engine instance of DjangoTemplates. return engine.engine.render_to_string( template_name, context, context_instance, dirs, dictionary) |