euscanwww: django 1.4 port

Signed-off-by: Corentin Chary <corentincj@iksaif.net>

euscanwww/euscan/charts.py

@@ -12,8 +12,8 @@ import rrdtool
 import pylab
 import matplotlib
 
-CHARTS_ROOT = os.path.join(settings.MEDIA_ROOT, "charts")
-CHARTS_URL = os.path.join(settings.MEDIA_URL, "charts")
+CHARTS_ROOT = os.path.join(settings.EUSCAN_ROOT, 'var', 'charts')
+CHARTS_URL = os.path.join(settings.EUSCAN_ROOT, 'var', 'charts')
 CHARTS_TTL = (24 * 60 * 60)
 
 pylab.rcParams['font.size'] = 10.0

euscanwww/euscan/management/commands/scan-metadata.py

@@ -48,18 +48,18 @@ class Command(BaseCommand):
 
     def scan(self, query=None, obj=None):
         matches = Query(query).find(
-                include_masked=True,
-                in_installed=False,
+            include_masked=True,
+            in_installed=False,
         )
 
         if not matches:
-                sys.stderr.write(self.style.ERROR("Unknown package '%s'\n" % query))
-                return
+            sys.stderr.write(self.style.ERROR("Unknown package '%s'\n" % query))
+            return
 
 	matches = sorted(matches)
         pkg = matches.pop()
 	if '9999' in pkg.version and len(matches):
-		pkg = matches.pop()
+            pkg = matches.pop()
 
         if not obj:
             obj, created = Package.objects.get_or_create(category=pkg.category, name=pkg.name)

euscanwww/euscan/models.py

@@ -1,5 +1,4 @@
 from django.db import models
-from datetime import datetime
 
 class Herd(models.Model):
     herd = models.CharField(max_length=128, unique=True)
@@ -74,7 +73,7 @@ class VersionLog(models.Model):
     )
 
     package = models.ForeignKey(Package)
-    datetime = models.DateTimeField(default=datetime.now())
+    datetime = models.DateTimeField(auto_now_add=True)
     slot = models.CharField(max_length=128)
     revision = models.CharField(max_length=128)
     version = models.CharField(max_length=128)

euscanwww/euscan/templatetags/timedelta.py

@@ -1,5 +1,7 @@
 from django import template
 from django.utils.timesince import timesince
+from django.conf import settings
+from django.utils.timezone import make_aware, get_default_timezone
 from datetime import datetime
 
 register = template.Library()
@@ -11,6 +13,8 @@ def timedelta(value, arg=None):
         cmp = arg
     else:
         cmp = datetime.now()
+        if settings.USE_TZ:
+            cmp = make_aware(cmp, get_default_timezone())
     if value > cmp:
         return "in %s" % timesince(cmp,value)
     else:

euscanwww/euscan/views.py

@@ -3,8 +3,8 @@ from django.http import HttpResponse, Http404
 from django.shortcuts import get_object_or_404
 from django.db.models import Sum, Max
 
-from euscan.models import Version, Package, Herd, Maintainer, EuscanResult, VersionLog
-from euscan.forms import WorldForm, PackagesForm
+from models import Version, Package, Herd, Maintainer, EuscanResult, VersionLog
+from forms import WorldForm, PackagesForm
 
 import charts