Merge branch 'master' of /srv/git/repositories/parabolaweb

1 files changed, 3 insertions, 4 deletions

diff --git a/mirrors/views.py b/mirrors/views.py
index f03a2e8a..417e26ee 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -57,7 +57,7 @@ def find_mirrors(request, countries=None, protocols=None, use_status=False,
                 is_download=True).values_list('protocol', flat=True)
     qset = MirrorUrl.objects.select_related().filter(
             protocol__protocol__in=protocols,
-            mirror__public=True, mirror__active=True, mirror__isos=True
+            mirror__public=True, mirror__active=True,
     )
     if countries and 'all' not in countries:
         qset = qset.filter(Q(country__in=countries) |
@@ -155,9 +155,8 @@ class MirrorStatusJSONEncoder(DjangoJSONEncoder):
             # mainly for queryset serialization
             return list(obj)
         if isinstance(obj, MirrorUrl):
-            data = {}
-            for attr in self.url_attributes:
-                data[attr] = getattr(obj, attr)
+            data = dict((attr, getattr(obj, attr))
+                    for attr in self.url_attributes)
             # separate because it isn't on the URL directly
             data['country'] = obj.real_country
             return data