Merge tag 'release_2013-11-25' into archweb-generic

Django 1.6 upgrade and other changes

Conflicts:
	templates/news/list.html
	templates/public/index.html

1 files changed, 4 insertions, 4 deletions

diff --git a/public/views.py b/public/views.py
index b34c4d8a..92065e3a 100644
--- a/public/views.py
+++ b/public/views.py
@@ -107,7 +107,7 @@ def keys(request):
             'owner__userprofile', 'revoker__userprofile').filter(
             revoked__isnull=True)
 
-    sig_counts = PGPSignature.objects.filter(not_expired, valid=True,
+    sig_counts = PGPSignature.objects.filter(not_expired, revoked__isnull=True,
             signee__in=user_key_ids).order_by().values_list('signer').annotate(
             Count('signer'))
     sig_counts = {key_id[-16:]: ct for key_id, ct in sig_counts}
@@ -117,11 +117,11 @@ def keys(request):
 
     # frozenset because we are going to do lots of __contains__ lookups
     signatures = frozenset(PGPSignature.objects.filter(
-            not_expired, valid=True).values_list('signer', 'signee'))
+            not_expired, revoked__isnull=True).values_list('signer', 'signee'))
 
     restrict = Q(signer__in=user_key_ids) & Q(signee__in=user_key_ids)
     cross_signatures = PGPSignature.objects.filter(restrict,
-            not_expired, valid=True).order_by('created')
+            not_expired, revoked__isnull=True).order_by('created')
 
     context = {
         'keys': master_keys,
@@ -164,7 +164,7 @@ def keys_json(request):
     })
 
     not_expired = Q(expires__gt=datetime.utcnow) | Q(expires__isnull=True)
-    signatures = PGPSignature.objects.filter(not_expired, valid=True)
+    signatures = PGPSignature.objects.filter(not_expired, revoked__isnull=True)
     edge_list = [{ 'signee': sig.signee, 'signer': sig.signer }
             for sig in signatures]