diff options
| author | Дилян Палаузов <Dilyan.Palauzov@db.com> | 2018-01-03 18:52:12 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-01-03 20:12:23 -0500 |
| commit | d7b2aa24f75434c2ce50100cfef3586071e0747a (patch) | |
| tree | 9074eb7522888e744f948c52174f367a4281c200 /django/middleware/http.py | |
| parent | c2d0f8c084456b5073252a91eeb09ab3d7453b18 (diff) | |
Fixed #28982 -- Simplified code with and/or.
Diffstat (limited to 'django/middleware/http.py')
| -rw-r--r-- | django/middleware/http.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/django/middleware/http.py b/django/middleware/http.py index a739597f91..4fcde85698 100644 --- a/django/middleware/http.py +++ b/django/middleware/http.py @@ -23,8 +23,7 @@ class ConditionalGetMiddleware(MiddlewareMixin): etag = response.get('ETag') last_modified = response.get('Last-Modified') - if last_modified: - last_modified = parse_http_date_safe(last_modified) + last_modified = last_modified and parse_http_date_safe(last_modified) if etag or last_modified: return get_conditional_response( |