From efa9397a9c9bafc23e1fba4a10e6bbd706a5414e Mon Sep 17 00:00:00 2001 From: Hidden Z Date: Fri, 26 Nov 2010 19:06:40 +0000 Subject: [PATCH] Revert "pyi2phosts/urls.py: use separate functions to get dates" This reverts commit 3c193bcdc3b7cfbf5f4b855d7cdd9931ef565ba1. This patch doesn't solves the problem. We need django 1.3 or workaround like described here: http://pascut.com/2008/08/16/django-generic-views-cache-behavior/ --- pyi2phosts/urls.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pyi2phosts/urls.py b/pyi2phosts/urls.py index 2f9cd50..7024034 100644 --- a/pyi2phosts/urls.py +++ b/pyi2phosts/urls.py @@ -12,12 +12,6 @@ from pyi2phosts.extsources.models import ExternalSource from pyi2phosts.postkey.models import i2phost import settings -def now_date(): - return datetime.datetime.utcnow() - -def start_date(): - return now_date() - datetime.timedelta(days=settings.LATEST_DAY_COUNT) - extsources = { 'queryset': ExternalSource.objects.filter(active=True), 'template_name': 'faq.html', @@ -37,9 +31,11 @@ browse_hosts = { } } +now_date = datetime.datetime.utcnow() +start_date = now_date - datetime.timedelta(days=settings.LATEST_DAY_COUNT) latest_hosts = { 'queryset': i2phost.objects.filter(activated=True, - date_added__range=(start_date(), now_date())).order_by("-date_added")[:settings.LATEST_HOSTS_COUNT], + date_added__range=(start_date, now_date)).order_by("-date_added")[:settings.LATEST_HOSTS_COUNT], 'template_name': 'latest.html', 'template_object_name': 'host', 'paginate_by': 40,