From 52a96c16863b1a10ee4af87fd969c10f1b5b6ae7 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sun, 19 Mar 2006 23:45:00 +0000 Subject: [PATCH] magic-removal: Merged to [2531] git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2532 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/related.py | 4 ++-- django/utils/cache.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django/db/models/related.py b/django/db/models/related.py index 64b6cb2880..32a72434f1 100644 --- a/django/db/models/related.py +++ b/django/db/models/related.py @@ -58,7 +58,7 @@ class RelatedObject(object): change = count - len(objects) if change > 0: - return objects + [None for _ in range(change)] + return objects + [None] * len(change) if change < 0: return objects[:change] else: # Just right @@ -68,7 +68,7 @@ class RelatedObject(object): # object return [attr] else: - return [None for _ in range(self.field.rel.num_in_admin)] + return [None] * len(self.field.rel.num_in_admin) def editable_fields(self): "Get the fields in this class that should be edited inline." diff --git a/django/utils/cache.py b/django/utils/cache.py index 4c7d0bb840..7c7a41bafa 100644 --- a/django/utils/cache.py +++ b/django/utils/cache.py @@ -73,12 +73,12 @@ def patch_response_headers(response, cache_timeout=None): if cache_timeout is None: cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS now = datetime.datetime.utcnow() - expires = now + datetime.timedelta(0, cache_timeout) if not response.has_header('ETag'): response['ETag'] = md5.new(response.get_content_as_string('utf8')).hexdigest() if not response.has_header('Last-Modified'): response['Last-Modified'] = now.strftime('%a, %d %b %Y %H:%M:%S GMT') if not response.has_header('Expires'): + expires = now + datetime.timedelta(0, cache_timeout) response['Expires'] = expires.strftime('%a, %d %b %Y %H:%M:%S GMT') patch_cache_control(response, max_age=cache_timeout)