From 76c37ce3acc7a4af0271c7535d4a33042f7749b5 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 24 Jul 2012 09:35:55 -0500
Subject: Replace deprecated direct_to_template() with render() shortcut

Now that Django actually provides a concise way to use a RequestContext
object without instantiating it, we can use that rather than the old
function-based generic view that worked well to do the same.
Additionally, these function-based generic views will be gone in Django
1.5, so might as well make the move now.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 public/views.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'public/views.py')

diff --git a/public/views.py b/public/views.py
index 3ea8f841..3f68545c 100644
--- a/public/views.py
+++ b/public/views.py
@@ -5,8 +5,8 @@
 from django.contrib.auth.models import User
 from django.db.models import Count, Q
 from django.http import Http404
+from django.shortcuts import render
 from django.views.decorators.cache import cache_control
-from django.views.generic.simple import direct_to_template
 
 from devel.models import MasterKey, PGPSignature
 from main.models import Arch, Repo, Donor
@@ -21,7 +21,7 @@ def index(request):
         'news_updates': News.objects.order_by('-postdate', '-id')[:15],
         'pkg_updates': pkgs,
     }
-    return direct_to_template(request, 'public/index.html', context)
+    return render(request, 'public/index.html', context)
 
 USER_LISTS = {
     'devs': {
@@ -55,14 +55,14 @@ def userlist(request, user_type='devs'):
     users = users.distinct()
     context = USER_LISTS[user_type].copy()
     context['users'] = users
-    return direct_to_template(request, 'public/userlist.html', context)
+    return render(request, 'public/userlist.html', context)
 
 @cache_control(max_age=300)
 def donate(request):
     context = {
         'donors': Donor.objects.filter(visible=True).order_by('name'),
     }
-    return direct_to_template(request, 'public/donate.html', context)
+    return render(request, 'public/donate.html', context)
 
 @cache_control(max_age=300)
 def download(request):
@@ -76,7 +76,7 @@ def download(request):
         'releng_pxeboot_url': settings.PXEBOOT_URL,
         'mirror_urls': mirror_urls,
     }
-    return direct_to_template(request, 'public/download.html', context)
+    return render(request, 'public/download.html', context)
 
 @cache_control(max_age=300)
 def feeds(request):
@@ -84,7 +84,7 @@ def feeds(request):
         'arches': Arch.objects.all(),
         'repos': Repo.objects.all(),
     }
-    return direct_to_template(request, 'public/feeds.html', context)
+    return render(request, 'public/feeds.html', context)
 
 @cache_control(max_age=300)
 def keys(request):
@@ -113,6 +113,6 @@ def keys(request):
         'active_users': users,
         'signatures': signatures,
     }
-    return direct_to_template(request, 'public/keys.html', context)
+    return render(request, 'public/keys.html', context)
 
 # vim: set ts=4 sw=4 et:
-- 
cgit v1.2.3-54-g00ecf


From 0cc369e985dd6376f0367e4b57e980ce14231796 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 31 Jul 2012 00:09:28 -0500
Subject: Update several bits and pieces for staging packages

This will prevent [staging] packages from cluttering normal user's view
on the website, but allow us to still import everything from this
repository for developer use.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 feeds.py               |  7 +++++--
 main/models.py         | 35 ++++++++++++++++++++++++-----------
 public/utils.py        | 12 +++++++++---
 public/views.py        |  5 ++++-
 sitestatic/archweb.css |  1 +
 5 files changed, 43 insertions(+), 17 deletions(-)

(limited to 'public/views.py')

diff --git a/feeds.py b/feeds.py
index 2e9b349b..d6a97533 100644
--- a/feeds.py
+++ b/feeds.py
@@ -38,6 +38,7 @@ def package_etag(request, *args, **kwargs):
 def package_last_modified(request, *args, **kwargs):
     return retrieve_latest(Package)
 
+
 class PackageFeed(Feed):
     feed_type = GuidNotPermalinkFeed
 
@@ -51,8 +52,7 @@ def __call__(self, request, *args, **kwargs):
 
     def get_object(self, request, arch='', repo=''):
         obj = dict()
-        qs = Package.objects.normal().order_by(
-                '-last_update')
+        qs = Package.objects.normal().order_by('-last_update')
 
         if arch != '':
             # feed for a single arch, also include 'any' packages everywhere
@@ -64,6 +64,8 @@ def get_object(self, request, arch='', repo=''):
             r = Repo.objects.get(name__iexact=repo)
             qs = qs.filter(repo=r)
             obj['repo'] = r
+        else:
+            qs = qs.filter(repo__staging=False)
         obj['qs'] = qs[:50]
         return obj
 
@@ -114,6 +116,7 @@ def news_etag(request, *args, **kwargs):
 def news_last_modified(request, *args, **kwargs):
     return retrieve_latest(News, 'last_modified')
 
+
 class NewsFeed(Feed):
     feed_type = GuidNotPermalinkFeed
 
diff --git a/main/models.py b/main/models.py
index 6c9dfe4d..577f11c6 100644
--- a/main/models.py
+++ b/main/models.py
@@ -4,6 +4,7 @@
 from pgpdump import BinaryData
 
 from django.db import models
+from django.db.models import Q
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.utils.timezone import now
@@ -24,6 +25,12 @@ def flagged(self):
     def normal(self):
         return self.select_related('arch', 'repo')
 
+    def restricted(self, user=None):
+        qs = self.normal()
+        if user is not None and user.is_authenticated:
+            return qs
+        return qs.filter(repo__staging=False)
+
 class Donor(models.Model):
     name = models.CharField(max_length=255, unique=True)
     visible = models.BooleanField(default=True,
@@ -193,22 +200,26 @@ def get_requiredby(self):
             requiredby = requiredby.filter(
                     pkg__arch__in=self.applicable_arches())
         # sort out duplicate packages; this happens if something has a double
-        # versioned dep such as a kernel module
+        # versioned depend such as a kernel module
         requiredby = [list(vals)[0] for _, vals in
                 groupby(requiredby, lambda x: x.pkg.id)]
+        if len(requiredby) == 0:
+            return requiredby
 
-        # find another package by this name in the opposite testing setup
-        # TODO: figure out staging exclusions too
-        if not Package.objects.filter(pkgname=self.pkgname,
-                arch=self.arch).exclude(id=self.id).exclude(
-                repo__testing=self.repo.testing).exists():
+        # find another package by this name in a different testing or staging
+        # repo; if we can't, we can short-circuit some checks
+        repo_q = (Q(repo__testing=(not self.repo.testing)) |
+                Q(repo__staging=(not self.repo.staging)))
+        if not Package.objects.filter(
+                repo_q, pkgname=self.pkgname, arch=self.arch
+                ).exclude(id=self.id).exists():
             # there isn't one? short circuit, all required by entries are fine
             return requiredby
 
         trimmed = []
         # for each unique package name, try to screen our package list down to
-        # those packages in the same testing category (yes or no) iff there is
-        # a package in the same testing category.
+        # those packages in the same testing and staging category (yes or no)
+        # iff there is a package in the same testing and staging category.
         for _, dep_pkgs in groupby(requiredby, lambda x: x.pkg.pkgname):
             dep_pkgs = list(dep_pkgs)
             dep = dep_pkgs[0]
@@ -254,7 +265,7 @@ def base_package(self):
             return Package.objects.normal().get(arch=self.arch,
                     repo=self.repo, pkgname=self.pkgbase)
         except Package.DoesNotExist:
-            # this package might be split across repos? just find one
+            # this package might be split across repos? find one
             # that matches the correct [testing] repo flag
             pkglist = Package.objects.normal().filter(arch=self.arch,
                     repo__testing=self.repo.testing,
@@ -271,8 +282,10 @@ def split_packages(self):
         repo.testing and repo.staging flags. For any non-split packages, the
         return value will be an empty list.
         """
-        return Package.objects.normal().filter(arch__in=self.applicable_arches(),
-                repo__testing=self.repo.testing, repo__staging=self.repo.staging,
+        return Package.objects.normal().filter(
+                arch__in=self.applicable_arches(),
+                repo__testing=self.repo.testing,
+                repo__staging=self.repo.staging,
                 pkgbase=self.pkgbase).exclude(id=self.id)
 
     def flag_request(self):
diff --git a/public/utils.py b/public/utils.py
index a40c9b53..bf74881a 100644
--- a/public/utils.py
+++ b/public/utils.py
@@ -1,6 +1,6 @@
 from operator import attrgetter
 
-from main.models import Arch, Package
+from main.models import Arch, Repo, Package
 from main.utils import cache_function, groupby_preserve_order, PackageStandin
 
 class RecentUpdate(object):
@@ -50,7 +50,13 @@ def package_links(self):
                     yield PackageStandin(package)
 
 @cache_function(62)
-def get_recent_updates(number=15):
+def get_recent_updates(number=15, testing=True, staging=False):
+    repos = Repo.objects.all()
+    if not testing:
+        repos = repos.exclude(testing=True)
+    if not staging:
+        repos = repos.exclude(staging=True)
+
     # This is a bit of magic. We are going to show 15 on the front page, but we
     # want to try and eliminate cross-architecture wasted space. Pull enough
     # packages that we can later do some screening and trim out the fat.
@@ -59,7 +65,7 @@ def get_recent_updates(number=15):
     fetch = number * 6
     for arch in Arch.objects.all():
         pkgs += list(Package.objects.normal().filter(
-            arch=arch).order_by('-last_update')[:fetch])
+            arch=arch, repo__in=repos).order_by('-last_update')[:fetch])
     pkgs.sort(key=attrgetter('last_update'), reverse=True)
 
     same_pkgbase_key = lambda x: (x.repo.name, x.pkgbase)
diff --git a/public/views.py b/public/views.py
index 3f68545c..c8854b72 100644
--- a/public/views.py
+++ b/public/views.py
@@ -16,7 +16,10 @@
 
 @cache_control(max_age=300)
 def index(request):
-    pkgs = get_recent_updates()
+    if request.user.is_authenticated():
+        pkgs = get_recent_updates(testing=True, staging=True)
+    else:
+        pkgs = get_recent_updates()
     context = {
         'news_updates': News.objects.order_by('-postdate', '-id')[:15],
         'pkg_updates': pkgs,
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index be1dde1a..91cacd7b 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -797,6 +797,7 @@ form#flag-pkg-form input[type=text] {
 
 #pkgdetails #metadata .virtual-dep,
 #pkgdetails #metadata .testing-dep,
+#pkgdetails #metadata .staging-dep,
 #pkgdetails #metadata .opt-dep,
 #pkgdetails #metadata .dep-desc {
     font-style: italic;
-- 
cgit v1.2.3-54-g00ecf


From 3f0c024754047d92e8ce4aa4ecf93a06865f8448 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 31 Jul 2012 18:37:30 -0500
Subject: PGP key handling updates

* Import signatures for all known keys, not just active developers
* Ensure we are only showing and accounting for active developers on the
  master keys page
* Add a new table showing signatures between developers

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 devel/management/commands/generate_keyring.py |  2 +-
 main/templatetags/pgp.py                      |  8 +++++++
 public/views.py                               | 18 +++++++++++-----
 templates/public/keys.html                    | 30 +++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 6 deletions(-)

(limited to 'public/views.py')

diff --git a/devel/management/commands/generate_keyring.py b/devel/management/commands/generate_keyring.py
index b9117c84..15ae488d 100644
--- a/devel/management/commands/generate_keyring.py
+++ b/devel/management/commands/generate_keyring.py
@@ -48,7 +48,7 @@ def generate_keyring(keyserver, keyring):
     logger.info("getting all known key IDs")
 
     # Screw you Django, for not letting one natively do value != <empty string>
-    key_ids = UserProfile.objects.filter(user__is_active=True,
+    key_ids = UserProfile.objects.filter(
             pgp_key__isnull=False).extra(where=["pgp_key != ''"]).values_list(
             "pgp_key", flat=True)
     logger.info("%d keys fetched from user profiles", len(key_ids))
diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py
index 50b1aa17..5c9fe511 100644
--- a/main/templatetags/pgp.py
+++ b/main/templatetags/pgp.py
@@ -39,6 +39,14 @@ def pgp_key_link(key_id, link_text=None):
     values = (url, format_key(key_id), link_text)
     return '<a href="%s" title="PGP key search for %s">%s</a>' % values
 
+@register.simple_tag
+def user_pgp_key_link(users, key_id):
+    matched = [user for user in users if user.userprofile.pgp_key and
+            user.userprofile.pgp_key[-16:] == key_id[-16:]]
+    if matched and len(matched) == 1:
+        return pgp_key_link(key_id, matched[0].get_full_name())
+    return pgp_key_link(key_id)
+
 @register.filter
 def pgp_fingerprint(key_id, autoescape=True):
     if not key_id:
diff --git a/public/views.py b/public/views.py
index c8854b72..312cb3b2 100644
--- a/public/views.py
+++ b/public/views.py
@@ -91,30 +91,38 @@ def feeds(request):
 
 @cache_control(max_age=300)
 def keys(request):
+    users = User.objects.filter(is_active=True).select_related(
+            'userprofile__pgp_key').order_by('first_name', 'last_name')
+    user_key_ids = frozenset(user.userprofile.pgp_key[-16:] for user in users
+            if user.userprofile.pgp_key)
+
     not_expired = Q(expires__gt=datetime.utcnow) | Q(expires__isnull=True)
     master_keys = MasterKey.objects.select_related('owner', 'revoker',
             'owner__userprofile', 'revoker__userprofile').filter(
             revoked__isnull=True)
+    master_key_ids = frozenset(key.pgp_key[-16:] for key in master_keys)
 
-    sig_counts = PGPSignature.objects.filter(
-            not_expired, valid=True).values_list('signer').annotate(
+    sig_counts = PGPSignature.objects.filter(not_expired, valid=True,
+            signee__in=user_key_ids).values_list('signer').annotate(
             Count('signer'))
     sig_counts = dict((key_id[-16:], ct) for key_id, ct in sig_counts)
 
     for key in master_keys:
         key.signature_count = sig_counts.get(key.pgp_key[-16:], 0)
 
-    users = User.objects.filter(is_active=True).select_related(
-            'userprofile__pgp_key').order_by('first_name', 'last_name')
-
     # frozenset because we are going to do lots of __contains__ lookups
     signatures = frozenset(PGPSignature.objects.filter(
             not_expired, valid=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')
+
     context = {
         'keys': master_keys,
         'active_users': users,
         'signatures': signatures,
+        'cross_signatures': cross_signatures,
     }
     return render(request, 'public/keys.html', context)
 
diff --git a/templates/public/keys.html b/templates/public/keys.html
index 1fed3c15..1b027202 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -89,6 +89,33 @@ <h2>Master Signing Keys</h2>
         </tbody>
     </table>
 </div>
+
+<div class="box">
+    <h2>Developer Cross-Signatures</h2>
+
+    <p>This table lists signatures directly between developer keys.</p>
+
+    <table class="pretty2" id="cross-signatures">
+        <thead>
+            <tr>
+                <th>Signer</th>
+                <th>Signee</th>
+                <th>Created</th>
+                <th>Expires</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for sig in cross_signatures %}
+            <tr>
+                <td>{% user_pgp_key_link active_users sig.signer %}</td>
+                <td>{% user_pgp_key_link active_users sig.signee %}</td>
+                <td>{{ sig.created }}</td>
+                <td>{{ sig.expires|default:"" }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
@@ -97,6 +124,9 @@ <h2>Master Signing Keys</h2>
         sortLocaleCompare: true,
         headers: { 1: { sorter: false } }
     });
+    $("#cross-signatures").tablesorter({
+        sortLocaleCompare: true
+    });
 });
 </script>
 {% endblock %}
-- 
cgit v1.2.3-54-g00ecf


From 3eed426027ed6bc87b58f82d48da06bea55b265f Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 25 Sep 2012 00:30:05 -0500
Subject: Add structured data to developer listing pages

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 public/views.py                      |  3 +++
 templates/public/developer_list.html | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'public/views.py')

diff --git a/public/views.py b/public/views.py
index 312cb3b2..35315e0e 100644
--- a/public/views.py
+++ b/public/views.py
@@ -29,14 +29,17 @@ def index(request):
 USER_LISTS = {
     'devs': {
         'user_type': 'Developers',
+        'user_title': 'Developer',
         'description': "This is a list of the current Arch Linux Developers. They maintain the [core] and [extra] package repositories in addition to doing any other developer duties.",
     },
     'tus': {
         'user_type': 'Trusted Users',
+        'user_title': 'Trusted User',
         'description': "Here are all your friendly Arch Linux Trusted Users who are in charge of the [community] repository.",
     },
     'fellows': {
         'user_type': 'Fellows',
+        'user_title': 'Fellow',
         'description': "Below you can find a list of ex-developers (aka project fellows). These folks helped make Arch what it is today. Thanks!",
     },
 }
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 376ab433..df4137eb 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -12,17 +12,24 @@
 <table class="arch-bio-entry">
     {% for dev in dev_list %}
     {% with dev.userprofile as prof %}
-    <tr>
+    <tr itemscope itemtype="http://schema.org/Person">
         <td class="pic pic-{{ dev.username }}">
-            <img src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/>
+            <img itemprop="image" src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/>
         </td>
         <td>
+            <meta itemprop="name" content="{{ dev.get_full_name|escape }}"/>
+            <meta itemprop="givenName" content="{{ dev.first_name|escape }}"/>
+            <meta itemprop="familyName" content="{{ dev.last_name|escape }}"/>
+            <meta itemprop="jobTitle" content="{{ user_title|escape }}"/>
+            <div style="display:none" itemprop="memberOf" itemscope itemtype="http://schema.org/Organization">
+                <meta itemprop="name" content="Arch Linux"/>
+            </div>
             <h3>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %}
             <a class="headerlink" name="{{ dev.username }}" id="{{ dev.username }}" href="#{{ dev.username }}" title="Permalink">¶</a></h3>
             <table class="bio bio-{{ dev.username }}">
                 <tr>
                     <th>Alias:</th>
-                    <td>{{ prof.alias }}</td>
+                    <td itemprop="additionalName">{{ prof.alias }}</td>
                 </tr><tr>
                     <th>Email:</th>
                     <td>{{ prof.public_email }}</td>
@@ -38,7 +45,7 @@ <h3>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% end
                     </td>
                 </tr><tr>
                     <th>Website:</th>
-                    <td>{% if prof.website %}<a href="{{ prof.website }}"
+                    <td>{% if prof.website %}<a itemprop="url" href="{{ prof.website }}"
                             title="Visit the website for {{ dev.get_full_name }}">
                             {{ prof.website }}</a>{% endif %}</td>
                 </tr><tr>
@@ -46,7 +53,7 @@ <h3>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% end
                     <td>{{ prof.occupation }}</td>
                 </tr><tr>
                     <th>YOB:</th>
-                    <td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
+                    <td itemprop="birthDate">{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
                 </tr><tr>
                     <th>Location:</th>
                     <td>{% if dev.userprofile.country %}<img src="{{ dev.userprofile.country.flag }}" alt="{{ dev.userprofile.country.name }}"/> {% endif %}{{ prof.location }}</td>
-- 
cgit v1.2.3-54-g00ecf


From 67fef06fe8d07e8b832e447a6b2064fb051a5ef9 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 25 Sep 2012 00:49:54 -0500
Subject: Only show staging feeds to logged-in users

This doesn't prevent unauthenticated users from accessing the feeds, but
it should reduce clutter and confusion on the feeds index page for users
unlikely to need these feeds.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 public/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'public/views.py')

diff --git a/public/views.py b/public/views.py
index 35315e0e..42f2f345 100644
--- a/public/views.py
+++ b/public/views.py
@@ -86,9 +86,12 @@ def download(request):
 
 @cache_control(max_age=300)
 def feeds(request):
+    repos = Repo.objects.all()
+    if not request.user.is_authenticated():
+        repos = repos.filter(staging=False)
     context = {
         'arches': Arch.objects.all(),
-        'repos': Repo.objects.all(),
+        'repos': repos,
     }
     return render(request, 'public/feeds.html', context)
 
-- 
cgit v1.2.3-54-g00ecf


From 45d81a9578e846062550335495dbceb82f16a1a0 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 13 Nov 2012 10:03:55 -0600
Subject: Move JSON keys view to public/ app

This seems like a more appropriate place, and now the visualization is
done here anyway so we should move the data backing it.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 public/views.py            | 53 ++++++++++++++++++++++++++++++++++++++++++++--
 templates/public/keys.html |  2 +-
 urls.py                    |  1 +
 visualize/urls.py          |  1 -
 visualize/views.py         | 51 +++++---------------------------------------
 5 files changed, 58 insertions(+), 50 deletions(-)

(limited to 'public/views.py')

diff --git a/public/views.py b/public/views.py
index 42f2f345..96120761 100644
--- a/public/views.py
+++ b/public/views.py
@@ -1,12 +1,13 @@
 from datetime import datetime
+import json
 from operator import attrgetter
 
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.db.models import Count, Q
-from django.http import Http404
+from django.http import Http404, HttpResponse
 from django.shortcuts import render
-from django.views.decorators.cache import cache_control
+from django.views.decorators.cache import cache_control, cache_page
 
 from devel.models import MasterKey, PGPSignature
 from main.models import Arch, Repo, Donor
@@ -14,6 +15,7 @@
 from news.models import News
 from .utils import get_recent_updates
 
+
 @cache_control(max_age=300)
 def index(request):
     if request.user.is_authenticated():
@@ -44,6 +46,7 @@ def index(request):
     },
 }
 
+
 @cache_control(max_age=300)
 def userlist(request, user_type='devs'):
     users = User.objects.order_by(
@@ -63,6 +66,7 @@ def userlist(request, user_type='devs'):
     context['users'] = users
     return render(request, 'public/userlist.html', context)
 
+
 @cache_control(max_age=300)
 def donate(request):
     context = {
@@ -70,6 +74,7 @@ def donate(request):
     }
     return render(request, 'public/donate.html', context)
 
+
 @cache_control(max_age=300)
 def download(request):
     mirror_urls = MirrorUrl.objects.select_related('mirror').filter(
@@ -84,6 +89,7 @@ def download(request):
     }
     return render(request, 'public/download.html', context)
 
+
 @cache_control(max_age=300)
 def feeds(request):
     repos = Repo.objects.all()
@@ -95,6 +101,7 @@ def feeds(request):
     }
     return render(request, 'public/feeds.html', context)
 
+
 @cache_control(max_age=300)
 def keys(request):
     users = User.objects.filter(is_active=True).select_related(
@@ -132,4 +139,46 @@ def keys(request):
     }
     return render(request, 'public/keys.html', context)
 
+
+@cache_page(1800)
+def keys_json(request):
+    node_list = []
+
+    users = User.objects.filter(is_active=True).select_related('userprofile')
+    node_list.extend({
+            'name': dev.get_full_name(),
+            'key': dev.userprofile.pgp_key,
+            'group': 'dev'
+        } for dev in users.filter(groups__name='Developers'))
+    node_list.extend({
+            'name': tu.get_full_name(),
+            'key': tu.userprofile.pgp_key,
+            'group': 'tu'
+        } for tu in users.filter(groups__name='Trusted Users').exclude(
+            groups__name='Developers'))
+
+    master_keys = MasterKey.objects.select_related('owner').filter(
+            revoked__isnull=True)
+    node_list.extend({
+            'name': 'Master Key (%s)' % key.owner.get_full_name(),
+            'key': key.pgp_key,
+            'group': 'master'
+        } for key in master_keys)
+
+    node_list.append({
+        'name': 'CA Cert Signing Authority',
+        'key': 'A31D4F81EF4EBD07B456FA04D2BB0D0165D0FD58',
+        'group': 'cacert',
+    })
+
+    not_expired = Q(expires__gt=datetime.utcnow) | Q(expires__isnull=True)
+    signatures = PGPSignature.objects.filter(not_expired, valid=True)
+    edge_list = [{ 'signee': sig.signee, 'signer': sig.signer }
+            for sig in signatures]
+
+    data = { 'nodes': node_list, 'edges': edge_list }
+
+    to_json = json.dumps(data, ensure_ascii=False)
+    return HttpResponse(to_json, mimetype='application/json')
+
 # vim: set ts=4 sw=4 et:
diff --git a/templates/public/keys.html b/templates/public/keys.html
index 81713efb..9af491e2 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -149,7 +149,7 @@ <h2 id="cross-sigs">Developer Cross-Signatures</h2>
     });
 });
 $(document).ready(function() {
-    developer_keys("#visualize-keys", "{% url 'visualize-pgp_keys' %}");
+    developer_keys("#visualize-keys", "{% url 'pgp-keys-json' %}");
 });
 </script>
 {% endblock %}
diff --git a/urls.py b/urls.py
index fd5ff7cf..1bdf1a58 100644
--- a/urls.py
+++ b/urls.py
@@ -67,6 +67,7 @@
     (r'^donate/$',       'donate',   {}, 'page-donate'),
     (r'^download/$',     'download', {}, 'page-download'),
     (r'^master-keys/$',  'keys',     {}, 'page-keys'),
+    (r'^master-keys/json/$', 'keys_json', {}, 'pgp-keys-json'),
 )
 
 urlpatterns += patterns('retro.views',
diff --git a/visualize/urls.py b/visualize/urls.py
index 907f6a22..8c3ea06a 100644
--- a/visualize/urls.py
+++ b/visualize/urls.py
@@ -4,7 +4,6 @@
     (r'^$',          'index',     {}, 'visualize-index'),
     (r'^by_arch/$',  'by_arch',   {}, 'visualize-byarch'),
     (r'^by_repo/$',  'by_repo',   {}, 'visualize-byrepo'),
-    (r'^pgp_keys/$', 'pgp_keys',  {}, 'visualize-pgp_keys'),
 )
 
 # vim: set ts=4 sw=4 et:
diff --git a/visualize/views.py b/visualize/views.py
index 44e60472..8d878937 100644
--- a/visualize/views.py
+++ b/visualize/views.py
@@ -1,18 +1,17 @@
-from datetime import datetime
 import json
 
-from django.contrib.auth.models import User
-from django.db.models import Count, Sum, Q
+from django.db.models import Count, Sum
 from django.http import HttpResponse
 from django.shortcuts import render
 from django.views.decorators.cache import cache_page
 
 from main.models import Package, Arch, Repo
-from devel.models import MasterKey, PGPSignature
+
 
 def index(request):
     return render(request, 'visualize/index.html')
 
+
 def arch_repo_data():
     qs = Package.objects.select_related().values(
             'arch__name', 'repo__name').annotate(
@@ -58,58 +57,18 @@ def build_map(name, arch, repo):
     }
     return data
 
+
 @cache_page(1800)
 def by_arch(request):
     data = arch_repo_data()
     to_json = json.dumps(data['by_arch'], ensure_ascii=False)
     return HttpResponse(to_json, mimetype='application/json')
 
+
 @cache_page(1800)
 def by_repo(request):
     data = arch_repo_data()
     to_json = json.dumps(data['by_repo'], ensure_ascii=False)
     return HttpResponse(to_json, mimetype='application/json')
 
-
-@cache_page(1800)
-def pgp_keys(request):
-    node_list = []
-
-    users = User.objects.filter(is_active=True).select_related('userprofile')
-    node_list.extend({
-            'name': dev.get_full_name(),
-            'key': dev.userprofile.pgp_key,
-            'group': 'dev'
-        } for dev in users.filter(groups__name='Developers'))
-    node_list.extend({
-            'name': tu.get_full_name(),
-            'key': tu.userprofile.pgp_key,
-            'group': 'tu'
-        } for tu in users.filter(groups__name='Trusted Users').exclude(
-            groups__name='Developers'))
-
-    master_keys = MasterKey.objects.select_related('owner').filter(
-            revoked__isnull=True)
-    node_list.extend({
-            'name': 'Master Key (%s)' % key.owner.get_full_name(),
-            'key': key.pgp_key,
-            'group': 'master'
-        } for key in master_keys)
-
-    node_list.append({
-        'name': 'CA Cert Signing Authority',
-        'key': 'A31D4F81EF4EBD07B456FA04D2BB0D0165D0FD58',
-        'group': 'cacert',
-    })
-
-    not_expired = Q(expires__gt=datetime.utcnow) | Q(expires__isnull=True)
-    signatures = PGPSignature.objects.filter(not_expired, valid=True)
-    edge_list = [{ 'signee': sig.signee, 'signer': sig.signer }
-            for sig in signatures]
-
-    data = { 'nodes': node_list, 'edges': edge_list }
-
-    to_json = json.dumps(data, ensure_ascii=False)
-    return HttpResponse(to_json, mimetype='application/json')
-
 # vim: set ts=4 sw=4 et:
-- 
cgit v1.2.3-54-g00ecf


From 6dd4d54bb0adbbb0f8c2b1beaa92b7a58971cf88 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 16 Nov 2012 16:20:11 -0600
Subject: Use Python 2.7 dictionary comprehension syntax

Rather than the old idiom of dict((k, v) for <> in <>).

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 devel/management/commands/reporead.py         |  4 ++--
 devel/management/commands/reporead_inotify.py |  2 +-
 mirrors/views.py                              | 11 ++++-------
 packages/templatetags/package_extras.py       |  2 +-
 packages/utils.py                             |  5 ++---
 packages/views/signoff.py                     |  8 +++-----
 public/views.py                               |  2 +-
 visualize/views.py                            |  4 ++--
 8 files changed, 16 insertions(+), 22 deletions(-)

(limited to 'public/views.py')

diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
index a1e77b49..3d4e6375 100644
--- a/devel/management/commands/reporead.py
+++ b/devel/management/commands/reporead.py
@@ -377,7 +377,7 @@ def db_update(archname, reponame, pkgs, force=False):
     # This makes our inner loop where we find packages by name *way* more
     # efficient by not having to go to the database for each package to
     # SELECT them by name.
-    dbdict = dict((dbpkg.pkgname, dbpkg) for dbpkg in dbpkgs)
+    dbdict = {dbpkg.pkgname: dbpkg for dbpkg in dbpkgs}
 
     dbset = set(dbdict.keys())
     syncset = set([pkg.name for pkg in pkgs])
@@ -446,7 +446,7 @@ def filesonly_update(archname, reponame, pkgs, force=False):
     """
     logger.info('Updating files for %s (%s)', reponame, archname)
     dbpkgs = update_common(archname, reponame, pkgs, False)
-    dbdict = dict((dbpkg.pkgname, dbpkg) for dbpkg in dbpkgs)
+    dbdict = {dbpkg.pkgname: dbpkg for dbpkg in dbpkgs}
     dbset = set(dbdict.keys())
 
     for pkg in (pkg for pkg in pkgs if pkg.name in dbset):
diff --git a/devel/management/commands/reporead_inotify.py b/devel/management/commands/reporead_inotify.py
index c74762eb..16b3869c 100644
--- a/devel/management/commands/reporead_inotify.py
+++ b/devel/management/commands/reporead_inotify.py
@@ -69,7 +69,7 @@ def setup_notifier(self):
         finally builds and returns a notifier object.'''
         arches = Arch.objects.filter(agnostic=False)
         repos = Repo.objects.all()
-        arch_path_map = dict((arch, None) for arch in arches)
+        arch_path_map = {arch: None for arch in arches}
         all_paths = set()
         total_paths = 0
         for arch in arches:
diff --git a/mirrors/views.py b/mirrors/views.py
index 2e1e83b6..d0ce0a97 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -94,7 +94,7 @@ def default_protocol_filter(original_urls):
 
 def status_filter(original_urls):
     status_info = get_mirror_statuses()
-    scores = dict((u.id, u.score) for u in status_info['urls'])
+    scores = {u.id: u.score for u in status_info['urls']}
     urls = []
     for u in original_urls:
         u.score = scores.get(u.id, None)
@@ -165,7 +165,7 @@ def mirrors(request):
     if not request.user.is_authenticated():
         mirror_list = mirror_list.filter(public=True, active=True)
         protos = protos.filter(mirror__public=True, mirror__active=True)
-    protos = dict((k, list(v)) for k, v in groupby(protos, key=itemgetter(0)))
+    protos = {k: list(v) for k, v in groupby(protos, key=itemgetter(0))}
     for mirror in mirror_list:
         items = protos.get(mirror.id, [])
         mirror.protocols = [item[1] for item in items]
@@ -253,8 +253,7 @@ def default(self, obj):
             # mainly for queryset serialization
             return list(obj)
         if isinstance(obj, MirrorUrl):
-            data = dict((attr, getattr(obj, attr))
-                    for attr in self.url_attributes)
+            data = {attr: getattr(obj, attr) for attr in self.url_attributes}
             # get any override on the country attribute first
             country = obj.real_country
             data['country'] = unicode(country.name)
@@ -277,9 +276,7 @@ def default(self, obj):
                     check_time__gte=cutoff).order_by('check_time')
             return data
         if isinstance(obj, MirrorLog):
-            data = dict((attr, getattr(obj, attr))
-                    for attr in self.log_attributes)
-            return data
+            return {attr: getattr(obj, attr) for attr in self.log_attributes}
         return super(ExtendedMirrorStatusJSONEncoder, self).default(obj)
 
 
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index 994265d8..f3613e69 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -13,7 +13,7 @@
 def link_encode(url, query):
     # massage the data into all utf-8 encoded strings first, so urlencode
     # doesn't barf at the data we pass it
-    query = dict((k, unicode(v).encode('utf-8')) for k, v in query.items())
+    query = {k: unicode(v).encode('utf-8') for k, v in query.items()}
     data = urlencode(query).replace('&', '&amp;')
     return "%s?%s" % (url, data)
 
diff --git a/packages/utils.py b/packages/utils.py
index 051fed8e..199e141d 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -385,7 +385,7 @@ def signoffs_id_query(model, repos):
     repo_sql = ','.join(['%s' for r in repos])
     sql = sql % (model._meta.db_table, repo_sql, repo_sql)
     repo_ids = [r.pk for r in repos]
-	# repo_ids are needed twice, so double the array
+    # repo_ids are needed twice, so double the array
     cursor.execute(sql, repo_ids * 2)
 
     results = cursor.fetchall()
@@ -474,8 +474,7 @@ def default(self, obj):
             # mainly for queryset serialization
             return list(obj)
         if isinstance(obj, Package):
-            data = dict((attr, getattr(obj, attr))
-                    for attr in self.pkg_attributes)
+            data = {attr: getattr(obj, attr) for attr in self.pkg_attributes}
             for attr in self.pkg_list_attributes:
                 data[attr] = getattr(obj, attr).all()
             return data
diff --git a/packages/views/signoff.py b/packages/views/signoff.py
index 56eb060c..824a9922 100644
--- a/packages/views/signoff.py
+++ b/packages/views/signoff.py
@@ -155,8 +155,8 @@ class SignoffJSONEncoder(DjangoJSONEncoder):
 
     def default(self, obj):
         if isinstance(obj, PackageSignoffGroup):
-            data = dict((attr, getattr(obj, attr))
-                    for attr in self.signoff_group_attrs)
+            data = {attr: getattr(obj, attr)
+                    for attr in self.signoff_group_attrs}
             data['pkgnames'] = [p.pkgname for p in obj.packages]
             data['package_count'] = len(obj.packages)
             data['approved'] = obj.approved()
@@ -164,9 +164,7 @@ def default(self, obj):
                     for attr in self.signoff_spec_attrs)
             return data
         elif isinstance(obj, Signoff):
-            data = dict((attr, getattr(obj, attr))
-                    for attr in self.signoff_attrs)
-            return data
+            return {attr: getattr(obj, attr) for attr in self.signoff_attrs}
         elif isinstance(obj, Arch) or isinstance(obj, Repo):
             return unicode(obj)
         elif isinstance(obj, User):
diff --git a/public/views.py b/public/views.py
index 96120761..3e15f9df 100644
--- a/public/views.py
+++ b/public/views.py
@@ -118,7 +118,7 @@ def keys(request):
     sig_counts = PGPSignature.objects.filter(not_expired, valid=True,
             signee__in=user_key_ids).values_list('signer').annotate(
             Count('signer'))
-    sig_counts = dict((key_id[-16:], ct) for key_id, ct in sig_counts)
+    sig_counts = {key_id[-16:]: ct for key_id, ct in sig_counts}
 
     for key in master_keys:
         key.signature_count = sig_counts.get(key.pgp_key[-16:], 0)
diff --git a/visualize/views.py b/visualize/views.py
index 8d878937..48e8f86b 100644
--- a/visualize/views.py
+++ b/visualize/views.py
@@ -33,8 +33,8 @@ def build_map(name, arch, repo):
 
     # now transform these results into two mappings: one ordered (repo, arch),
     # and one ordered (arch, repo).
-    arch_groups = dict((a, build_map(a, a, None)) for a in arches)
-    repo_groups = dict((r, build_map(r, None, r)) for r in repos)
+    arch_groups = {a: build_map(a, a, None) for a in arches}
+    repo_groups = {r: build_map(r, None, r) for r in repos}
     for row in qs:
         arch = row['arch__name']
         repo = row['repo__name']
-- 
cgit v1.2.3-54-g00ecf


From f7331a0eca351300685ebee494e810d8c82c35b1 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 20 Nov 2012 19:16:25 -0600
Subject: Add Release model to releng

This should prevent the need for monthly template updates from Pierre
and Thomas; best to just let them enter the data themselves and have it
show up on the website.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 public/views.py                             |   6 ++
 releng/admin.py                             |  23 +++---
 releng/migrations/0004_auto__add_release.py | 121 ++++++++++++++++++++++++++++
 releng/models.py                            |  19 ++++-
 templates/public/download.html              |  22 +++--
 5 files changed, 167 insertions(+), 24 deletions(-)
 create mode 100644 releng/migrations/0004_auto__add_release.py

(limited to 'public/views.py')

diff --git a/public/views.py b/public/views.py
index 3e15f9df..fefe032e 100644
--- a/public/views.py
+++ b/public/views.py
@@ -13,6 +13,7 @@
 from main.models import Arch, Repo, Donor
 from mirrors.models import MirrorUrl
 from news.models import News
+from releng.models import Release
 from .utils import get_recent_updates
 
 
@@ -77,12 +78,17 @@ def donate(request):
 
 @cache_control(max_age=300)
 def download(request):
+    try:
+        release = Release.objects.filter(available=True).latest()
+    except Release.DoesNotExist:
+        release = None
     mirror_urls = MirrorUrl.objects.select_related('mirror').filter(
             protocol__default=True,
             mirror__public=True, mirror__active=True, mirror__isos=True)
     sort_by = attrgetter('real_country.name', 'mirror.name')
     mirror_urls = sorted(mirror_urls, key=sort_by)
     context = {
+        'release': release,
         'releng_iso_url': settings.ISO_LIST_URL,
         'releng_pxeboot_url': settings.PXEBOOT_URL,
         'mirror_urls': mirror_urls,
diff --git a/releng/admin.py b/releng/admin.py
index 42755002..c7e6396e 100644
--- a/releng/admin.py
+++ b/releng/admin.py
@@ -2,7 +2,7 @@
 
 from .models import (Architecture, BootType, Bootloader, ClockChoice,
         Filesystem, HardwareType, InstallType, Iso, IsoType, Module, Source,
-        Test)
+        Test, Release)
 
 class IsoAdmin(admin.ModelAdmin):
     list_display = ('name', 'created', 'active', 'removed')
@@ -14,19 +14,20 @@ class TestAdmin(admin.ModelAdmin):
             'iso', 'success')
     list_filter = ('success', 'iso')
 
+class ReleaseAdmin(admin.ModelAdmin):
+    list_display = ('version', 'release_date', 'kernel_version', 'available',
+            'created')
+    list_filter = ('available', 'release_date')
 
-admin.site.register(Architecture)
-admin.site.register(BootType)
-admin.site.register(Bootloader)
-admin.site.register(ClockChoice)
-admin.site.register(Filesystem)
-admin.site.register(HardwareType)
-admin.site.register(InstallType)
-admin.site.register(IsoType)
-admin.site.register(Module)
-admin.site.register(Source)
+
+SIMPLE_MODELS = (Architecture, BootType, Bootloader, ClockChoice, Filesystem,
+        HardwareType, InstallType, IsoType, Module, Source)
+
+for model in SIMPLE_MODELS:
+    admin.site.register(model)
 
 admin.site.register(Iso, IsoAdmin)
 admin.site.register(Test, TestAdmin)
+admin.site.register(Release, ReleaseAdmin)
 
 # vim: set ts=4 sw=4 et:
diff --git a/releng/migrations/0004_auto__add_release.py b/releng/migrations/0004_auto__add_release.py
new file mode 100644
index 00000000..fe4acea5
--- /dev/null
+++ b/releng/migrations/0004_auto__add_release.py
@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        db.create_table('releng_release', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('release_date', self.gf('django.db.models.fields.DateField')(db_index=True)),
+            ('version', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('kernel_version', self.gf('django.db.models.fields.CharField')(max_length=50, blank=True)),
+            ('torrent_infohash', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')()),
+            ('available', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('info', self.gf('django.db.models.fields.TextField')(blank=True)),
+        ))
+        db.send_create_signal('releng', ['Release'])
+
+    def backwards(self, orm):
+        db.delete_table('releng_release')
+
+
+    models = {
+        'releng.architecture': {
+            'Meta': {'object_name': 'Architecture'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.bootloader': {
+            'Meta': {'object_name': 'Bootloader'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.boottype': {
+            'Meta': {'object_name': 'BootType'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.clockchoice': {
+            'Meta': {'object_name': 'ClockChoice'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.filesystem': {
+            'Meta': {'object_name': 'Filesystem'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.hardwaretype': {
+            'Meta': {'object_name': 'HardwareType'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.installtype': {
+            'Meta': {'object_name': 'InstallType'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.iso': {
+            'Meta': {'object_name': 'Iso'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'removed': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'})
+        },
+        'releng.isotype': {
+            'Meta': {'object_name': 'IsoType'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.module': {
+            'Meta': {'object_name': 'Module'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.release': {
+            'Meta': {'ordering': "('-release_date', '-version')", 'object_name': 'Release'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'info': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'kernel_version': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'release_date': ('django.db.models.fields.DateField', [], {'db_index': 'True'}),
+            'torrent_infohash': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'releng.source': {
+            'Meta': {'object_name': 'Source'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'releng.test': {
+            'Meta': {'object_name': 'Test'},
+            'architecture': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.Architecture']"}),
+            'boot_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.BootType']"}),
+            'bootloader': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.Bootloader']"}),
+            'clock_choice': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.ClockChoice']"}),
+            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'filesystem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.Filesystem']"}),
+            'hardware_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.HardwareType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'install_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.InstallType']"}),
+            'ip_address': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'iso': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.Iso']"}),
+            'iso_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.IsoType']"}),
+            'modules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['releng.Module']", 'null': 'True', 'blank': 'True'}),
+            'rollback_filesystem': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rollback_test_set'", 'null': 'True', 'to': "orm['releng.Filesystem']"}),
+            'rollback_modules': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'rollback_test_set'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['releng.Module']"}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['releng.Source']"}),
+            'success': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'user_name': ('django.db.models.fields.CharField', [], {'max_length': '500'})
+        }
+    }
+
+    complete_apps = ['releng']
diff --git a/releng/models.py b/releng/models.py
index bd178add..2f9a0785 100644
--- a/releng/models.py
+++ b/releng/models.py
@@ -105,7 +105,24 @@ class Test(models.Model):
     comments = models.TextField(null=True, blank=True)
 
 
-for model in (Iso, Test):
+class Release(models.Model):
+    release_date = models.DateField(db_index=True)
+    version = models.CharField(max_length=50)
+    kernel_version = models.CharField(max_length=50, blank=True)
+    torrent_infohash = models.CharField(max_length=64, blank=True)
+    created = models.DateTimeField(editable=False)
+    available = models.BooleanField(default=True)
+    info = models.TextField('Public information', blank=True)
+
+    class Meta:
+        get_latest_by = 'release_date'
+        ordering = ('-release_date', '-version')
+
+    def __unicode__(self):
+        return self.version
+
+
+for model in (Iso, Test, Release):
     pre_save.connect(set_created_field, sender=model,
             dispatch_uid="releng.models")
 
diff --git a/templates/public/download.html b/templates/public/download.html
index 2fddd4e9..d0754e5b 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -7,7 +7,6 @@
 {% block navbarclass %}anb-download{% endblock %}
 
 {% block content %}
-{% with version="2012.11.01" kernel_version="3.6.4" torrent_infohash="f86f84c74edc90336f94f0837afa3071ada2aaa8" %}
 <div id="arch-downloads" class="box">
 
     <h2>Arch Linux Downloads</h2>
@@ -20,8 +19,8 @@ <h3>Release Info</h3>
     can always be updated with `pacman -Syu`.</p>
 
     <ul>
-        <li><strong>Current Release:</strong> {{ version }}</li>
-        <li><strong>Included Kernel:</strong> {{ kernel_version }}</li>
+        <li><strong>Current Release:</strong> {{ release.version }}</li>
+        <li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>
         <li><a href="https://wiki.archlinux.org/index.php/Installation_Guide">Installation Guide</a></li>
         <li><strong>Resources:</strong>
             <ul>
@@ -45,9 +44,9 @@ <h3>BitTorrent Download (recommended)</h3>
     download is finished, so you can seed it back to others.
     <em>A web-seed capable client is recommended for fastest download speeds.</em></p>
     <ul>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-dual.iso.torrent"
-                    title="Download for both architectures">Download archlinux-{{version}}-dual.iso.torrent</a>
-            (<a href="magnet:?xt=urn:btih:{{torrent_infohash}}&amp;dn=archlinux-{{version}}-dual.iso&amp;tr=udp://tracker.archlinux.org:6969&amp;tr=http://tracker.archlinux.org:6969/announce">Magnet</a>)</li>
+        <li><a href="https://www.archlinux.org/iso/{{ release.version }}/archlinux-{{ release.version }}-dual.iso.torrent"
+                    title="Download for both architectures">Download archlinux-{{ release.version }}-dual.iso.torrent</a>
+                (<a href="magnet:?{% if release.torrent_infohash %}xt=urn:btih:{{ release.torrent_infohash }}&amp;{% endif %}dn=archlinux-{{ release.version }}-dual.iso&amp;tr=udp://tracker.archlinux.org:6969&amp;tr=http://tracker.archlinux.org:6969/announce">Magnet</a>)</li>
     </ul>
 
     <h3>Netboot</h3>
@@ -70,11 +69,11 @@ <h4>Checksums</h4>
     <p>File integrity checksums for the latest releases can be found below:</p>
 
     <ul>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-dual.iso.sig"
+        <li><a href="https://www.archlinux.org/iso/{{ release.version }}/archlinux-{{ release.version }}-dual.iso.sig"
             title="Get the latest PGP signature">PGP signature</a></li>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/sha1sums.txt"
+        <li><a href="https://www.archlinux.org/iso/{{ release.version }}/sha1sums.txt"
             title="Get the latest SHA1 checksums">SHA1 checksums</a></li>
-        <li><a href="https://www.archlinux.org/iso/{{version}}/md5sums.txt"
+        <li><a href="https://www.archlinux.org/iso/{{ release.version }}/md5sums.txt"
             title="Get the latest MD5 checksums">MD5 checksums</a></li>
     </ul>
 
@@ -86,8 +85,8 @@ <h4>Checksums</h4>
         {% else %}<h5>Worldwide</h5>{% endif %}
         <ul>
             {% for mirror_url in country.list %}
-            <li><a href="{{ mirror_url.url }}iso/{{ version }}/"
-                title="Download from {{ mirror_url.url }}iso/{{ version }}/">{{ mirror_url.mirror.name }}</a></li>
+            <li><a href="{{ mirror_url.url }}iso/{{ release.version }}/"
+                title="Download from {{ mirror_url.url }}iso/{{ release.version }}/">{{ mirror_url.mirror.name }}</a></li>
             {% endfor %}
         </ul>
         {% endfor %}
@@ -98,5 +97,4 @@ <h4>Checksums</h4>
     instructions listed <a href="https://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.</p>
 
 </div>
-{% endwith %}
 {% endblock %}
-- 
cgit v1.2.3-54-g00ecf


From e7c331d361e0b6b5c9fb498793953119afcbf741 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 27 Dec 2012 22:51:20 -0600
Subject: Fix master key signing total counts

Commit 4c69911982 had an inadvertent side effect here; we need to
explicitly disable ordering for the annotate() to work correctly.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 public/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'public/views.py')

diff --git a/public/views.py b/public/views.py
index fefe032e..44ceb45d 100644
--- a/public/views.py
+++ b/public/views.py
@@ -122,7 +122,7 @@ def keys(request):
     master_key_ids = frozenset(key.pgp_key[-16:] for key in master_keys)
 
     sig_counts = PGPSignature.objects.filter(not_expired, valid=True,
-            signee__in=user_key_ids).values_list('signer').annotate(
+            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}
 
-- 
cgit v1.2.3-54-g00ecf


From 66850026ca934e5a09238e9033c541cdc5085a42 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 13 Jan 2013 22:34:33 -0600
Subject: Use content_type and not mimetype on HttpResponse()

Bug #16519 in Django deprecates mimetype, so update our code
accordingly.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 mirrors/views.py           | 4 ++--
 packages/views/__init__.py | 4 ++--
 packages/views/display.py  | 4 ++--
 packages/views/search.py   | 2 +-
 packages/views/signoff.py  | 4 ++--
 public/views.py            | 2 +-
 todolists/views.py         | 5 ++---
 visualize/views.py         | 4 ++--
 8 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'public/views.py')

diff --git a/mirrors/views.py b/mirrors/views.py
index 22da631a..d3867802 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -199,7 +199,7 @@ def mirror_details_json(request, name):
     data['version'] = 3
     to_json = json.dumps(data, ensure_ascii=False,
             cls=ExtendedMirrorStatusJSONEncoder)
-    response = HttpResponse(to_json, mimetype='application/json')
+    response = HttpResponse(to_json, content_type='application/json')
     return response
 
 
@@ -285,7 +285,7 @@ def status_json(request):
     data = status_info.copy()
     data['version'] = 3
     to_json = json.dumps(data, ensure_ascii=False, cls=MirrorStatusJSONEncoder)
-    response = HttpResponse(to_json, mimetype='application/json')
+    response = HttpResponse(to_json, content_type='application/json')
     return response
 
 # vim: set ts=4 sw=4 et:
diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index f7952255..4c195385 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -42,7 +42,7 @@ def opensearch(request):
 def opensearch_suggest(request):
     search_term = request.GET.get('q', '')
     if search_term == '':
-        return HttpResponse('', mimetype='application/x-suggestions+json')
+        return HttpResponse('', content_type='application/x-suggestions+json')
 
     cache_key = 'opensearch:packages:' + \
             hashlib.md5(search_term.encode('utf-8')).hexdigest()
@@ -59,7 +59,7 @@ def opensearch_suggest(request):
         results = [search_term, list(names)]
         to_json = json.dumps(results, ensure_ascii=False)
         cache.set(cache_key, to_json, 300)
-    return HttpResponse(to_json, mimetype='application/x-suggestions+json')
+    return HttpResponse(to_json, content_type='application/x-suggestions+json')
 
 
 @permission_required('main.change_package')
diff --git a/packages/views/display.py b/packages/views/display.py
index efedf6ff..445c1abe 100644
--- a/packages/views/display.py
+++ b/packages/views/display.py
@@ -188,7 +188,7 @@ def details_json(request, name, repo, arch):
     pkg = get_object_or_404(Package,
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     to_json = json.dumps(pkg, ensure_ascii=False, cls=PackageJSONEncoder)
-    return HttpResponse(to_json, mimetype='application/json')
+    return HttpResponse(to_json, content_type='application/json')
 
 
 def files_json(request, name, repo, arch):
@@ -209,7 +209,7 @@ def files_json(request, name, repo, arch):
         'files': fileslist,
     }
     to_json = json.dumps(data, ensure_ascii=False, cls=PackageJSONEncoder)
-    return HttpResponse(to_json, mimetype='application/json')
+    return HttpResponse(to_json, content_type='application/json')
 
 
 def download(request, name, repo, arch):
diff --git a/packages/views/search.py b/packages/views/search.py
index f6e670df..0f313ccb 100644
--- a/packages/views/search.py
+++ b/packages/views/search.py
@@ -197,6 +197,6 @@ def search_json(request):
             container['valid'] = True
 
     to_json = json.dumps(container, ensure_ascii=False, cls=PackageJSONEncoder)
-    return HttpResponse(to_json, mimetype='application/json')
+    return HttpResponse(to_json, content_type='application/json')
 
 # vim: set ts=4 sw=4 et:
diff --git a/packages/views/signoff.py b/packages/views/signoff.py
index 340b2311..17f3095c 100644
--- a/packages/views/signoff.py
+++ b/packages/views/signoff.py
@@ -67,7 +67,7 @@ def signoff_package(request, name, repo, arch, revoke=False):
             'user': str(request.user),
         }
         return HttpResponse(json.dumps(data, ensure_ascii=False),
-                mimetype='application/json')
+                content_type='application/json')
 
     return redirect('package-signoffs')
 
@@ -181,7 +181,7 @@ def signoffs_json(request):
         'signoff_groups': signoff_groups,
     }
     to_json = json.dumps(data, ensure_ascii=False, cls=SignoffJSONEncoder)
-    response = HttpResponse(to_json, mimetype='application/json')
+    response = HttpResponse(to_json, content_type='application/json')
     return response
 
 # vim: set ts=4 sw=4 et:
diff --git a/public/views.py b/public/views.py
index 44ceb45d..65b0c31f 100644
--- a/public/views.py
+++ b/public/views.py
@@ -185,6 +185,6 @@ def keys_json(request):
     data = { 'nodes': node_list, 'edges': edge_list }
 
     to_json = json.dumps(data, ensure_ascii=False)
-    return HttpResponse(to_json, mimetype='application/json')
+    return HttpResponse(to_json, content_type='application/json')
 
 # vim: set ts=4 sw=4 et:
diff --git a/todolists/views.py b/todolists/views.py
index f4f9ab21..fcf62e23 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -53,7 +53,7 @@ def flag(request, slug, pkg_id):
             'status': tlpkg.get_status_display(),
             'css_class': tlpkg.status_css_class(),
         }
-        return HttpResponse(json.dumps(data), mimetype='application/json')
+        return HttpResponse(json.dumps(data), content_type='application/json')
     return redirect(todolist)
 
 
@@ -87,8 +87,7 @@ def list_pkgbases(request, slug, svn_root):
             'pkgbase', flat=True).filter(
             todolist=todolist, repo__in=repos, removed__isnull=True).order_by(
             'pkgbase').distinct()
-    return HttpResponse('\n'.join(pkgbases),
-        mimetype='text/plain')
+    return HttpResponse('\n'.join(pkgbases), content_type='text/plain')
 
 
 def todolist_list(request):
diff --git a/visualize/views.py b/visualize/views.py
index 48e8f86b..9c537c20 100644
--- a/visualize/views.py
+++ b/visualize/views.py
@@ -62,13 +62,13 @@ def build_map(name, arch, repo):
 def by_arch(request):
     data = arch_repo_data()
     to_json = json.dumps(data['by_arch'], ensure_ascii=False)
-    return HttpResponse(to_json, mimetype='application/json')
+    return HttpResponse(to_json, content_type='application/json')
 
 
 @cache_page(1800)
 def by_repo(request):
     data = arch_repo_data()
     to_json = json.dumps(data['by_repo'], ensure_ascii=False)
-    return HttpResponse(to_json, mimetype='application/json')
+    return HttpResponse(to_json, content_type='application/json')
 
 # vim: set ts=4 sw=4 et:
-- 
cgit v1.2.3-54-g00ecf


From 6f0ae6746baea657ee6d7c21ac0813a04f825443 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 14 Jan 2013 01:00:11 -0600
Subject: Drop country column from mirror table

We now always look for this information at the URL level, not the mirror
level. This simplifies quite a bit of code in and around the mirror
views.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 mirrors/admin.py                                   |  4 +-
 .../0020_auto__del_field_mirror_country.py         | 70 ++++++++++++++++++++++
 mirrors/models.py                                  |  7 +--
 mirrors/utils.py                                   |  7 +--
 mirrors/views.py                                   | 15 ++---
 public/views.py                                    |  2 +-
 templates/mirrors/mirror_details.html              | 12 ++--
 templates/mirrors/mirrorlist.txt                   |  2 +-
 templates/mirrors/mirrorlist_status.txt            |  2 +-
 templates/mirrors/mirrors.html                     |  4 +-
 templates/mirrors/status_table.html                |  2 +-
 templates/public/download.html                     |  2 +-
 12 files changed, 93 insertions(+), 36 deletions(-)
 create mode 100644 mirrors/migrations/0020_auto__del_field_mirror_country.py

(limited to 'public/views.py')

diff --git a/mirrors/admin.py b/mirrors/admin.py
index 65fff368..eaa38391 100644
--- a/mirrors/admin.py
+++ b/mirrors/admin.py
@@ -62,9 +62,9 @@ class Meta:
 
 class MirrorAdmin(admin.ModelAdmin):
     form = MirrorAdminForm
-    list_display = ('name', 'tier', 'country', 'active', 'public',
+    list_display = ('name', 'tier', 'active', 'public',
             'isos', 'admin_email', 'alternate_email')
-    list_filter = ('tier', 'active', 'public', 'country')
+    list_filter = ('tier', 'active', 'public')
     search_fields = ('name', 'admin_email', 'alternate_email')
     inlines = [
             MirrorUrlInlineAdmin,
diff --git a/mirrors/migrations/0020_auto__del_field_mirror_country.py b/mirrors/migrations/0020_auto__del_field_mirror_country.py
new file mode 100644
index 00000000..c2220a50
--- /dev/null
+++ b/mirrors/migrations/0020_auto__del_field_mirror_country.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        db.delete_column('mirrors_mirror', 'country')
+
+
+    def backwards(self, orm):
+        db.add_column('mirrors_mirror', 'country',
+                      self.gf('django_countries.fields.CountryField')(blank=True, default='', max_length=2, db_index=True),
+                      keep_default=False)
+
+
+    models = {
+        'mirrors.mirror': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Mirror'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'blank': 'True'}),
+            'alternate_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'isos': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}),
+            'rsync_user': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}),
+            'tier': ('django.db.models.fields.SmallIntegerField', [], {'default': '2'}),
+            'upstream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['mirrors.Mirror']", 'null': 'True', 'on_delete': 'models.SET_NULL'})
+        },
+        'mirrors.mirrorlog': {
+            'Meta': {'object_name': 'MirrorLog'},
+            'check_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'duration': ('django.db.models.fields.FloatField', [], {'null': 'True'}),
+            'error': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_success': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'last_sync': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'url': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'logs'", 'to': "orm['mirrors.MirrorUrl']"})
+        },
+        'mirrors.mirrorprotocol': {
+            'Meta': {'ordering': "('protocol',)", 'object_name': 'MirrorProtocol'},
+            'default': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_download': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'protocol': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '10'})
+        },
+        'mirrors.mirrorrsync': {
+            'Meta': {'object_name': 'MirrorRsync'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.CharField', [], {'max_length': '24'}),
+            'mirror': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rsync_ips'", 'to': "orm['mirrors.Mirror']"})
+        },
+        'mirrors.mirrorurl': {
+            'Meta': {'object_name': 'MirrorUrl'},
+            'country': ('django_countries.fields.CountryField', [], {'db_index': 'True', 'max_length': '2', 'blank': 'True'}),
+            'has_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'has_ipv6': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mirror': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'to': "orm['mirrors.Mirror']"}),
+            'protocol': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'on_delete': 'models.PROTECT', 'to': "orm['mirrors.MirrorProtocol']"}),
+            'url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['mirrors']
diff --git a/mirrors/models.py b/mirrors/models.py
index 0179d5bf..ca421d13 100644
--- a/mirrors/models.py
+++ b/mirrors/models.py
@@ -17,7 +17,6 @@ class Mirror(models.Model):
     name = models.CharField(max_length=255, unique=True)
     tier = models.SmallIntegerField(default=2, choices=TIER_CHOICES)
     upstream = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
-    country = CountryField(blank=True, db_index=True)
     admin_email = models.EmailField(max_length=255, blank=True)
     alternate_email = models.EmailField(max_length=255, blank=True)
     public = models.BooleanField(default=True)
@@ -28,7 +27,7 @@ class Mirror(models.Model):
     notes = models.TextField(blank=True)
 
     class Meta:
-        ordering = ('country', 'name')
+        ordering = ('name',)
 
     def __unicode__(self):
         return self.name
@@ -75,10 +74,6 @@ def address_families(self):
     def hostname(self):
         return urlparse(self.url).hostname
 
-    @property
-    def real_country(self):
-        return self.country or self.mirror.country
-
     def clean(self):
         try:
             # Auto-map the protocol field by looking at the URL
diff --git a/mirrors/utils.py b/mirrors/utils.py
index 1d560021..3ab176b3 100644
--- a/mirrors/utils.py
+++ b/mirrors/utils.py
@@ -115,7 +115,7 @@ def get_mirror_errors(cutoff=DEFAULT_CUTOFF, mirror_ids=None):
             is_success=False, check_time__gte=cutoff_time,
             url__mirror__active=True, url__mirror__public=True).values(
             'url__url', 'url__country', 'url__protocol__protocol',
-            'url__mirror__country', 'url__mirror__tier', 'error').annotate(
+            'url__mirror__tier', 'error').annotate(
             error_count=Count('error'), last_occurred=Max('check_time')
             ).order_by('-last_occurred', '-error_count')
 
@@ -124,8 +124,7 @@ def get_mirror_errors(cutoff=DEFAULT_CUTOFF, mirror_ids=None):
 
     errors = list(errors)
     for err in errors:
-        ctry_code = err['url__country'] or err['url__mirror__country']
-        err['country'] = Country(ctry_code)
+        err['country'] = Country(err['url__country'])
     return errors
 
 
@@ -152,7 +151,7 @@ def get_mirror_url_for_download(cutoff=DEFAULT_CUTOFF):
     mirror_urls = MirrorUrl.objects.filter(
             mirror__public=True, mirror__active=True, protocol__default=True)
     # look first for a country-agnostic URL, then fall back to any HTTP URL
-    filtered_urls = mirror_urls.filter(mirror__country='')[:1]
+    filtered_urls = mirror_urls.filter(country='')[:1]
     if not filtered_urls:
         filtered_urls = mirror_urls[:1]
     if not filtered_urls:
diff --git a/mirrors/views.py b/mirrors/views.py
index d3867802..545e3557 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -42,9 +42,6 @@ def __init__(self, *args, **kwargs):
 
     def get_countries(self):
         country_codes = set()
-        country_codes.update(Mirror.objects.filter(active=True).exclude(
-                country='').values_list(
-                'country', flat=True).order_by().distinct())
         country_codes.update(MirrorUrl.objects.filter(
                 mirror__active=True).exclude(country='').values_list(
                 'country', flat=True).order_by().distinct())
@@ -81,7 +78,7 @@ def generate_mirrorlist(request):
 
 
 def default_protocol_filter(original_urls):
-    key_func = attrgetter('real_country')
+    key_func = attrgetter('country')
     sorted_urls = sorted(original_urls, key=key_func)
     urls = []
     for _, group in groupby(sorted_urls, key=key_func):
@@ -119,8 +116,7 @@ def find_mirrors(request, countries=None, protocols=None, use_status=False,
             protocol__in=protocols,
             mirror__public=True, mirror__active=True)
     if countries and 'all' not in countries:
-        qset = qset.filter(Q(country__in=countries) |
-                Q(mirror__country__in=countries))
+        qset = qset.filter(country__in=countries)
 
     ip_version = Q()
     if ipv4_supported:
@@ -135,7 +131,7 @@ def find_mirrors(request, countries=None, protocols=None, use_status=False,
         urls = qset
 
     if not use_status:
-        sort_key = attrgetter('real_country.name', 'mirror.name', 'url')
+        sort_key = attrgetter('country.name', 'mirror.name', 'url')
         urls = sorted(urls, key=sort_key)
         template = 'mirrors/mirrorlist.txt'
     else:
@@ -158,7 +154,7 @@ def find_mirrors_simple(request, protocol):
 
 
 def mirrors(request):
-    mirror_list = Mirror.objects.select_related().order_by('tier', 'country')
+    mirror_list = Mirror.objects.select_related().order_by('tier', 'name')
     protos = MirrorUrl.objects.values_list(
             'mirror_id', 'protocol__protocol').order_by(
             'mirror__id', 'protocol__protocol').distinct()
@@ -254,8 +250,7 @@ def default(self, obj):
             return list(obj)
         if isinstance(obj, MirrorUrl):
             data = {attr: getattr(obj, attr) for attr in self.url_attributes}
-            # get any override on the country attribute first
-            country = obj.real_country
+            country = obj.country
             data['country'] = unicode(country.name)
             data['country_code'] = country.code
             return data
diff --git a/public/views.py b/public/views.py
index 65b0c31f..e15f5b89 100644
--- a/public/views.py
+++ b/public/views.py
@@ -85,7 +85,7 @@ def download(request):
     mirror_urls = MirrorUrl.objects.select_related('mirror').filter(
             protocol__default=True,
             mirror__public=True, mirror__active=True, mirror__isos=True)
-    sort_by = attrgetter('real_country.name', 'mirror.name')
+    sort_by = attrgetter('country.name', 'mirror.name')
     mirror_urls = sorted(mirror_urls, key=sort_by)
     context = {
         'release': release,
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 132557cd..a56123ff 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -18,10 +18,6 @@ <h2>Mirror Details: {{ mirror.name }}</h2>
             <th>Tier:</th>
             <td>{{ mirror.get_tier_display }}</td>
         </tr>
-        <tr>
-            <th>Country:</th>
-            <td>{% if mirror.country %}<img src="{{ mirror.country.flag }}" alt=""/> {% endif %}{{ mirror.country.name|default:'Worldwide' }}</td>
-        </tr>
         <tr>
             <th>Has ISOs:</th>
             <td>{{ mirror.isos|yesno|capfirst }}</td>
@@ -77,6 +73,8 @@ <h3>Available URLs</h3>
         <thead>
             <tr>
                 <th>Mirror URL</th>
+                <th>Protocol</th>
+                <th>Country</th>
                 <th>IPv4</th>
                 <th>IPv6</th>
                 <th>Last Sync</th>
@@ -91,6 +89,8 @@ <h3>Available URLs</h3>
             {% for m_url in urls %}
             <tr class="{% cycle 'odd' 'even' %}">
                 <td>{% if m_url.protocol.is_download %}<a href="{{ m_url.url }}">{{ m_url.url }}</a>{% else %}{{ m_url.url }}{% endif %}</td>
+                <td>{{ m_url.protocol }}</td>
+                <td class="country">{% if m_url.country %}<img src="{{ m_url.country.flag }}" alt=""/> {% endif %}{{ m_url.country.name }}</td>
                 <td>{{ m_url.has_ipv4|yesno|capfirst }}</td>
                 <td>{{ m_url.has_ipv6|yesno|capfirst }}</td>
                 <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td>
@@ -115,8 +115,8 @@ <h3>Mirror Status Chart</h3>
 <script type="text/javascript">
 $(document).ready(function() {
     $("#available_urls:has(tbody tr)").tablesorter(
-        {widgets: ['zebra'], sortList: [[0,0]],
-        headers: { 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } } });
+        {widgets: ['zebra'], sortList: [[1,0], [2,0]],
+        headers: { 8: { sorter: 'mostlydigit' }, 9: { sorter: 'mostlydigit' }, 10: { sorter: 'mostlydigit' } } });
 });
 $(document).ready(function() {
     mirror_status("#visualize-mirror", "./json/");
diff --git a/templates/mirrors/mirrorlist.txt b/templates/mirrors/mirrorlist.txt
index d3dd6e4e..a7f8e2af 100644
--- a/templates/mirrors/mirrorlist.txt
+++ b/templates/mirrors/mirrorlist.txt
@@ -8,6 +8,6 @@ content right, and then go back later to fix it all up.
 ## Generated on {% now "Y-m-d" %}
 ##{% for mirror_url in mirror_urls %}{% ifchanged %}
 
-## {{ mirror_url.real_country.name|default:'Worldwide' }}{% endifchanged %}
+## {{ mirror_url.country.name|default:'Worldwide' }}{% endifchanged %}
 #Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %}
 {% endautoescape %}
diff --git a/templates/mirrors/mirrorlist_status.txt b/templates/mirrors/mirrorlist_status.txt
index 523794b2..575d19f7 100644
--- a/templates/mirrors/mirrorlist_status.txt
+++ b/templates/mirrors/mirrorlist_status.txt
@@ -9,6 +9,6 @@ content right, and then go back later to fix it all up.
 ## Generated on {% now "Y-m-d" %}
 ##
 {% for mirror_url in mirror_urls %}
-## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.real_country.name|default:'Worldwide' }}
+## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.country.name|default:'Worldwide' }}
 #Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %}
 {% endautoescape %}
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html
index c83d0d43..458b693f 100644
--- a/templates/mirrors/mirrors.html
+++ b/templates/mirrors/mirrors.html
@@ -10,7 +10,6 @@ <h2>Mirror Overview</h2>
             <tr>
                 <th>Server</th>
                 <th>Tier</th>
-                <th>Country</th>
                 <th>ISOs</th>
                 <th>Protocols</th>
                 {% if user.is_authenticated %}
@@ -27,7 +26,6 @@ <h2>Mirror Overview</h2>
                 <td><a href="{{ mirror.get_absolute_url }}"
                         title="Mirror details for {{ mirror.name }}">{{ mirror.name }}</a></td>
                 <td>{{ mirror.get_tier_display }}</td>
-                <td>{% if mirror.country %}<img src="{{ mirror.country.flag }}" alt=""/> {% endif %}{{ mirror.country.name }}</td>
                 <td>{{ mirror.isos|yesno|capfirst }}</td>
                 <td class="wrap">{{ mirror.protocols|join:", " }}</td>
                 {% if user.is_authenticated %}
@@ -45,7 +43,7 @@ <h2>Mirror Overview</h2>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [2,0]]});
+    $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
 });
 </script>
 {% endblock %}
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index 1961d222..c7394de6 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -17,7 +17,7 @@
         {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
             <td>{{ m_url.url }}</td>
             <td>{{ m_url.protocol }}</td>
-            <td class="country">{% if m_url.real_country %}<img src="{{ m_url.real_country.flag }}" alt=""/> {% endif %}{{ m_url.real_country.name }}</td>
+            <td class="country">{% if m_url.country %}<img src="{{ m_url.country.flag }}" alt=""/> {% endif %}{{ m_url.country.name }}</td>
             <td>{{ m_url.completion_pct|percentage:1 }}</td>
             <td>{{ m_url.delay|duration|default:'unknown' }}</td>
             <td>{{ m_url.duration_avg|floatformat:2 }}</td>
diff --git a/templates/public/download.html b/templates/public/download.html
index 3005ffb3..0c96fcef 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -81,7 +81,7 @@ <h4>Checksums</h4>
 
     {% cache 600 download-mirrors %}
     <div id="download-mirrors">
-        {% regroup mirror_urls by real_country as grouped_urls %}
+        {% regroup mirror_urls by country as grouped_urls %}
         {% for country in grouped_urls %}
         {% if country.grouper %}<h5><img src="{{ country.grouper.flag }}" alt=""/> {{ country.grouper.name }}</h5>
         {% else %}<h5>Worldwide</h5>{% endif %}
-- 
cgit v1.2.3-54-g00ecf


From cba22a378b48f1a4f185a56a21f39483595cf8a6 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 18 Jan 2013 20:01:22 -0600
Subject: Don't pull and sort mirror URLs unless we have to

On the download page, the explicit sorted() call was forcing evaluation
of the Django queryset, even if we never actually needed the results
because the template fragment was cached. Wrap it all in a callable
function which looks the same to the template, but saves us the cost of
evaluation every single page view.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 public/views.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'public/views.py')

diff --git a/public/views.py b/public/views.py
index e15f5b89..3c823c9d 100644
--- a/public/views.py
+++ b/public/views.py
@@ -82,11 +82,16 @@ def download(request):
         release = Release.objects.filter(available=True).latest()
     except Release.DoesNotExist:
         release = None
-    mirror_urls = MirrorUrl.objects.select_related('mirror').filter(
-            protocol__default=True,
-            mirror__public=True, mirror__active=True, mirror__isos=True)
-    sort_by = attrgetter('country.name', 'mirror.name')
-    mirror_urls = sorted(mirror_urls, key=sort_by)
+
+    def mirror_urls():
+        '''In order to ensure this is lazily evaluated since we can't do
+        sorting at the database level, make it a callable.'''
+        urls = MirrorUrl.objects.select_related('mirror').filter(
+                protocol__default=True,
+                mirror__public=True, mirror__active=True, mirror__isos=True)
+        sort_by = attrgetter('country.name', 'mirror.name')
+        return sorted(urls, key=sort_by)
+
     context = {
         'release': release,
         'releng_iso_url': settings.ISO_LIST_URL,
-- 
cgit v1.2.3-54-g00ecf


From 23ef118ac129e17d251634d2ef3c88c6d74279e3 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 19 Jan 2013 10:37:14 -0600
Subject: Don't redefine mirror_url function every call

If we pull this out and define it at the top level once, we save the
interpreter a fair amount of work.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 public/views.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'public/views.py')

diff --git a/public/views.py b/public/views.py
index 3c823c9d..22cb8759 100644
--- a/public/views.py
+++ b/public/views.py
@@ -76,6 +76,16 @@ def donate(request):
     return render(request, 'public/donate.html', context)
 
 
+def _mirror_urls():
+    '''In order to ensure this is lazily evaluated since we can't do
+    sorting at the database level, make it a callable.'''
+    urls = MirrorUrl.objects.select_related('mirror').filter(
+            protocol__default=True,
+            mirror__public=True, mirror__active=True, mirror__isos=True)
+    sort_by = attrgetter('country.name', 'mirror.name')
+    return sorted(urls, key=sort_by)
+
+
 @cache_control(max_age=300)
 def download(request):
     try:
@@ -83,20 +93,11 @@ def download(request):
     except Release.DoesNotExist:
         release = None
 
-    def mirror_urls():
-        '''In order to ensure this is lazily evaluated since we can't do
-        sorting at the database level, make it a callable.'''
-        urls = MirrorUrl.objects.select_related('mirror').filter(
-                protocol__default=True,
-                mirror__public=True, mirror__active=True, mirror__isos=True)
-        sort_by = attrgetter('country.name', 'mirror.name')
-        return sorted(urls, key=sort_by)
-
     context = {
         'release': release,
         'releng_iso_url': settings.ISO_LIST_URL,
         'releng_pxeboot_url': settings.PXEBOOT_URL,
-        'mirror_urls': mirror_urls,
+        'mirror_urls': _mirror_urls,
     }
     return render(request, 'public/download.html', context)
 
-- 
cgit v1.2.3-54-g00ecf


From b7b24740640e24883cd17fd683e1d465fbb343f8 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 16 Apr 2013 22:12:01 -0500
Subject: Various minor code cleanups and fixes

Most of these were suggested by PyCharm, and include everything from
little syntax issues and other bad smells to dead or bad code.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 devel/management/commands/pgp_import.py               |  1 +
 devel/models.py                                       |  1 -
 devel/utils.py                                        |  2 +-
 devel/views.py                                        |  2 +-
 main/log.py                                           |  1 -
 main/migrations/0029_fill_in_repo_data.py             |  1 -
 main/models.py                                        | 12 +++++-------
 main/utils.py                                         |  1 -
 mirrors/management/commands/mirrorcheck.py            | 12 +++---------
 mirrors/models.py                                     |  2 +-
 mirrors/utils.py                                      |  6 +++---
 packages/migrations/0002_populate_package_relation.py |  2 --
 packages/templatetags/package_extras.py               |  4 ++--
 packages/utils.py                                     |  2 +-
 packages/views/display.py                             |  2 --
 packages/views/flag.py                                |  3 +--
 public/views.py                                       |  1 -
 releng/management/commands/syncisos.py                |  2 +-
 releng/models.py                                      |  2 +-
 releng/views.py                                       |  2 +-
 retro/templates/retro/index-20030330.html             |  1 -
 sitestatic/archweb.js                                 |  1 -
 todolists/utils.py                                    |  1 -
 todolists/views.py                                    |  1 -
 visualize/static/visualize.js                         |  2 +-
 25 files changed, 23 insertions(+), 44 deletions(-)

(limited to 'public/views.py')

diff --git a/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py
index 10e6cfcb..b1f29d77 100644
--- a/devel/management/commands/pgp_import.py
+++ b/devel/management/commands/pgp_import.py
@@ -95,6 +95,7 @@ def parse_keydata(data):
 
     # parse all of the output from our successful GPG command
     logger.info("parsing command output")
+    node = None
     for line in data.split('\n'):
         parts = line.split(':')
         if parts[0] == 'pub':
diff --git a/devel/models.py b/devel/models.py
index 67de40a6..4354e0f2 100644
--- a/devel/models.py
+++ b/devel/models.py
@@ -4,7 +4,6 @@
 from django.db import models
 from django.db.models.signals import pre_save
 from django.contrib.auth.models import User
-from django.utils.timezone import now
 from django_countries import CountryField
 
 from .fields import PGPKeyField
diff --git a/devel/utils.py b/devel/utils.py
index e8e3a6c4..340841f5 100644
--- a/devel/utils.py
+++ b/devel/utils.py
@@ -131,7 +131,7 @@ def find(self, userstring):
                 self.username_email, self.user_name)
         for matcher in find_methods:
             user = matcher(name, email)
-            if user != None:
+            if user is not None:
                 break
 
         self.cache[userstring] = user
diff --git a/devel/views.py b/devel/views.py
index 61c1e568..4258ea7f 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -34,7 +34,7 @@
 @login_required
 def index(request):
     '''the developer dashboard'''
-    if(request.user.is_authenticated()):
+    if request.user.is_authenticated():
         inner_q = PackageRelation.objects.filter(user=request.user)
     else:
         inner_q = PackageRelation.objects.none()
diff --git a/main/log.py b/main/log.py
index 63634874..5c745cc8 100644
--- a/main/log.py
+++ b/main/log.py
@@ -46,7 +46,6 @@ def filter(self, record):
 
         trace = '\n'.join(traceback.format_exception(*record.exc_info))
         key = md5(trace).hexdigest()
-        duplicate = False
         cache = self.cache_module.cache
 
         # Test if the cache works
diff --git a/main/migrations/0029_fill_in_repo_data.py b/main/migrations/0029_fill_in_repo_data.py
index 0887b28c..7da6b1c4 100644
--- a/main/migrations/0029_fill_in_repo_data.py
+++ b/main/migrations/0029_fill_in_repo_data.py
@@ -7,7 +7,6 @@
 class Migration(DataMigration):
 
     def forwards(self, orm):
-        "Write your forwards methods here."
         orm.Repo.objects.filter(name__istartswith='community').update(bugs_project=5, svn_root='community')
         orm.Repo.objects.filter(name__iexact='multilib').update(bugs_project=5, svn_root='community')
 
diff --git a/main/models.py b/main/models.py
index 89215f05..24aeed89 100644
--- a/main/models.py
+++ b/main/models.py
@@ -7,7 +7,6 @@
 from django.db.models import Q
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
-from django.utils.timezone import now
 
 from .fields import PositiveBigIntegerField
 from .utils import set_created_field
@@ -140,7 +139,7 @@ def get_full_url(self, proto='https'):
     @property
     def signature(self):
         try:
-            data = b64decode(self.pgp_signature)
+            data = b64decode(self.pgp_signature.encode('utf-8'))
         except TypeError:
             return None
         if not data:
@@ -274,7 +273,6 @@ def get_depends(self):
         Packages will match the testing status of this package if possible.
         """
         deps = []
-        arches = None
         # TODO: we can use list comprehension and an 'in' query to make this
         # more effective
         for dep in self.depends.all():
@@ -400,13 +398,13 @@ def elsewhere(self):
         '''attempt to locate this package anywhere else, regardless of
         architecture or repository. Excludes this package from the list.'''
         names = [self.pkgname]
-        if self.pkgname.startswith('lib32-'):
+        if self.pkgname.startswith(u'lib32-'):
             names.append(self.pkgname[6:])
-        elif self.pkgname.endswith('-multilib'):
+        elif self.pkgname.endswith(u'-multilib'):
             names.append(self.pkgname[:-9])
         else:
-            names.append('lib32-' + self.pkgname)
-            names.append(self.pkgname + '-multilib')
+            names.append(u'lib32-' + self.pkgname)
+            names.append(self.pkgname + u'-multilib')
         return Package.objects.normal().filter(
                 pkgname__in=names).exclude(id=self.id).order_by(
                 'arch__name', 'repo__name')
diff --git a/main/utils.py b/main/utils.py
index 8394e5cd..9ee8db58 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -3,7 +3,6 @@
 except ImportError:
     import pickle
 
-from datetime import datetime
 import hashlib
 
 from django.core.cache import cache
diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py
index d6de8f22..e7dd7b49 100644
--- a/mirrors/management/commands/mirrorcheck.py
+++ b/mirrors/management/commands/mirrorcheck.py
@@ -106,19 +106,13 @@ def parse_lastsync(log, data):
 
 
 def check_mirror_url(mirror_url, location, timeout):
-    if location:
-        if location.family == socket.AF_INET6:
-            ipopt = '--ipv6'
-        elif location.family == socket.AF_INET:
-            ipopt = '--ipv4'
-
     url = mirror_url.url + 'lastsync'
     logger.info("checking URL %s", url)
     log = MirrorLog(url=mirror_url, check_time=now(), location=location)
     headers = {'User-Agent': 'archweb/1.0'}
     req = urllib2.Request(url, None, headers)
+    start = time.time()
     try:
-        start = time.time()
         result = urllib2.urlopen(req, timeout=timeout)
         data = result.read()
         result.close()
@@ -147,12 +141,12 @@ def check_mirror_url(mirror_url, location, timeout):
         elif isinstance(e.reason, socket.error):
             log.error = e.reason.args[1]
         logger.debug("failed: %s, %s", url, log.error)
-    except HTTPException as e:
+    except HTTPException:
         # e.g., BadStatusLine
         log.is_success = False
         log.error = "Exception in processing HTTP request."
         logger.debug("failed: %s, %s", url, log.error)
-    except socket.timeout as e:
+    except socket.timeout:
         log.is_success = False
         log.error = "Connection timed out."
         logger.debug("failed: %s, %s", url, log.error)
diff --git a/mirrors/models.py b/mirrors/models.py
index 791b0078..d8ac7952 100644
--- a/mirrors/models.py
+++ b/mirrors/models.py
@@ -92,7 +92,7 @@ def clean(self):
             families = self.address_families()
             self.has_ipv4 = socket.AF_INET in families
             self.has_ipv6 = socket.AF_INET6 in families
-        except socket.error as e:
+        except socket.error:
             # We don't fail in this case; we'll just set both to False
             self.has_ipv4 = False
             self.has_ipv6 = False
diff --git a/mirrors/utils.py b/mirrors/utils.py
index 5a8bbf5d..531cf005 100644
--- a/mirrors/utils.py
+++ b/mirrors/utils.py
@@ -1,13 +1,13 @@
 from datetime import timedelta
 
 from django.db import connection
-from django.db.models import Avg, Count, Max, Min, StdDev
+from django.db.models import Count, Max, Min
 from django.utils.dateparse import parse_datetime
 from django.utils.timezone import now
 from django_countries.fields import Country
 
 from main.utils import cache_function, database_vendor
-from .models import MirrorLog, MirrorProtocol, MirrorUrl
+from .models import MirrorLog, MirrorUrl
 
 
 DEFAULT_CUTOFF = timedelta(hours=24)
@@ -165,7 +165,7 @@ def get_mirror_errors(cutoff=DEFAULT_CUTOFF, mirror_id=None):
             ).order_by('-last_occurred', '-error_count')
 
     if mirror_id:
-        urls = urls.filter(mirror_id=mirror_id)
+        errors = errors.filter(url__mirror_id=mirror_id)
 
     errors = list(errors)
     for err in errors:
diff --git a/packages/migrations/0002_populate_package_relation.py b/packages/migrations/0002_populate_package_relation.py
index 738e068f..b0d32c7a 100644
--- a/packages/migrations/0002_populate_package_relation.py
+++ b/packages/migrations/0002_populate_package_relation.py
@@ -11,7 +11,6 @@ class Migration(DataMigration):
     )
 
     def forwards(self, orm):
-        "Write your forwards methods here."
         # search by pkgbase first and insert those records
         qs = orm['main.Package'].objects.exclude(maintainer=None).exclude(
                 pkgbase=None).distinct().values('pkgbase', 'maintainer_id')
@@ -29,7 +28,6 @@ def forwards(self, orm):
                     defaults={'user_id': row['maintainer_id']})
 
     def backwards(self, orm):
-        "Write your backwards methods here."
         if not db.dry_run:
             orm.PackageRelation.objects.all().delete()
         pass
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index f14fab1e..ef0e1aea 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -53,10 +53,10 @@ def do_buildsortqs(parser, token):
         tagname, sortfield = token.split_contents()
     except ValueError:
         raise template.TemplateSyntaxError(
-                "%r tag requires a single argument" % tagname)
+                "%r tag requires a single argument" % token)
     if not (sortfield[0] == sortfield[-1] and sortfield[0] in ('"', "'")):
         raise template.TemplateSyntaxError(
-                "%r tag's argument should be in quotes" % tagname)
+                "%r tag's argument should be in quotes" % token)
     return BuildQueryStringNode(sortfield[1:-1])
 
 
diff --git a/packages/utils.py b/packages/utils.py
index a4217fbd..4f3b8665 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -391,7 +391,7 @@ def signoffs_id_query(model, repos):
     """
     cursor = connection.cursor()
     # query pre-process- fill in table name and placeholders for IN
-    repo_sql = ','.join(['%s' for r in repos])
+    repo_sql = ','.join(['%s' for _ in repos])
     sql = sql % (model._meta.db_table, repo_sql, repo_sql)
     repo_ids = [r.pk for r in repos]
     # repo_ids are needed twice, so double the array
diff --git a/packages/views/display.py b/packages/views/display.py
index 87424483..021c7ed8 100644
--- a/packages/views/display.py
+++ b/packages/views/display.py
@@ -228,8 +228,6 @@ def download(request, name, repo, arch):
     if pkg.arch.agnostic:
         # grab the first non-any arch to fake the download path
         arch = Arch.objects.exclude(agnostic=True)[0].name
-    values = {
-    }
     url = '{host}{repo}/os/{arch}/{filename}'.format(host=url.url,
             repo=pkg.repo.name.lower(), arch=arch, filename=pkg.filename)
     return redirect(url)
diff --git a/packages/views/flag.py b/packages/views/flag.py
index 5c76e1d5..39cdcef8 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -110,7 +110,7 @@ def perform_updates():
                 subject = '%s package [%s] marked out-of-date' % \
                         (pkg.repo.name, pkg.pkgname)
                 for maint in maints:
-                    if maint.userprofile.notify == True:
+                    if maint.userprofile.notify is True:
                         toemail.append(maint.email)
 
             if toemail:
@@ -133,7 +133,6 @@ def perform_updates():
             return redirect('package-flag-confirmed', name=name, repo=repo,
                     arch=arch)
     else:
-        initial = {}
         form = FlagForm(authenticated=authenticated)
 
     context = {
diff --git a/public/views.py b/public/views.py
index 22cb8759..39273396 100644
--- a/public/views.py
+++ b/public/views.py
@@ -125,7 +125,6 @@ def keys(request):
     master_keys = MasterKey.objects.select_related('owner', 'revoker',
             'owner__userprofile', 'revoker__userprofile').filter(
             revoked__isnull=True)
-    master_key_ids = frozenset(key.pgp_key[-16:] for key in master_keys)
 
     sig_counts = PGPSignature.objects.filter(not_expired, valid=True,
             signee__in=user_key_ids).order_by().values_list('signer').annotate(
diff --git a/releng/management/commands/syncisos.py b/releng/management/commands/syncisos.py
index c9f61964..f182cc33 100644
--- a/releng/management/commands/syncisos.py
+++ b/releng/management/commands/syncisos.py
@@ -20,7 +20,7 @@ def handle_starttag(self, tag, attrs):
         if tag == 'a':
             for name, value in attrs:
                 if name == "href":
-                    if value != '../' and self.url_re.search(value) != None:
+                    if value != '../' and self.url_re.search(value) is not None:
                         self.hyperlinks.append(value[:-1])
 
     def parse(self, url):
diff --git a/releng/models.py b/releng/models.py
index b95f7d52..5ee2f325 100644
--- a/releng/models.py
+++ b/releng/models.py
@@ -160,7 +160,7 @@ def info_html(self):
 
     def torrent(self):
         try:
-            data = b64decode(self.torrent_data)
+            data = b64decode(self.torrent_data.encode('utf-8'))
         except TypeError:
             return None
         if not data:
diff --git a/releng/views.py b/releng/views.py
index ad4b07d1..b1c76a4a 100644
--- a/releng/views.py
+++ b/releng/views.py
@@ -231,7 +231,7 @@ def release_torrent(request, version):
     release = get_object_or_404(Release, version=version)
     if not release.torrent_data:
         raise Http404
-    data = b64decode(release.torrent_data)
+    data = b64decode(release.torrent_data.encode('utf-8'))
     response = HttpResponse(data, content_type='application/x-bittorrent')
     # TODO: this is duplicated from Release.iso_url()
     filename = 'archlinux-%s-dual.iso.torrent' % release.version
diff --git a/retro/templates/retro/index-20030330.html b/retro/templates/retro/index-20030330.html
index 449731af..51cc8ba3 100644
--- a/retro/templates/retro/index-20030330.html
+++ b/retro/templates/retro/index-20030330.html
@@ -232,7 +232,6 @@
 <table width="100%"><tbody><tr><td align="right">
   [ <a href="http://web.archive.org/web/20030330090147/http://www.archlinux.org/oldnews.php">Older News</a> ]
 </td></tr></tbody></table><br>
-</p>
 <br>
 
 
diff --git a/sitestatic/archweb.js b/sitestatic/archweb.js
index dda22d9e..aa225f5f 100644
--- a/sitestatic/archweb.js
+++ b/sitestatic/archweb.js
@@ -146,7 +146,6 @@ if (typeof $ !== 'undefined' && typeof $.tablesorter !== 'undefined') {
 (function($) {
   $.fn.enableCheckboxRangeSelection = function() {
     var lastCheckbox = null,
-        lastElement = null,
         spec = this;
 
     spec.unbind("click.checkboxrange");
diff --git a/todolists/utils.py b/todolists/utils.py
index 51a75a3c..7b98c887 100644
--- a/todolists/utils.py
+++ b/todolists/utils.py
@@ -1,5 +1,4 @@
 from django.db import connections, router
-from django.db.models import Count
 
 from .models import Todolist, TodolistPackage
 from packages.models import Package
diff --git a/todolists/views.py b/todolists/views.py
index 7636d38e..d5b39934 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -9,7 +9,6 @@
 from django.views.decorators.cache import never_cache
 from django.views.generic import DeleteView
 from django.template import Context, loader
-from django.template.defaultfilters import slugify
 from django.utils.timezone import now
 
 from main.models import Package, Repo
diff --git a/visualize/static/visualize.js b/visualize/static/visualize.js
index 7e240d44..5004fe6c 100644
--- a/visualize/static/visualize.js
+++ b/visualize/static/visualize.js
@@ -55,7 +55,7 @@ function packages_treemap(chart_id, orderings, default_order) {
             var nodes = d3_div.data([json]).selectAll("div")
                 .data(treemap.nodes, key_func);
             /* start out new nodes in the center of the picture area */
-            var w_center = jq_div.width() / 2;
+            var w_center = jq_div.width() / 2,
                 h_center = jq_div.height() / 2;
             nodes.enter().append("div")
                 .attr("class", "treemap-cell")
-- 
cgit v1.2.3-54-g00ecf