Various minor code cleanups and fixesrelease_2013-04-16

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>

3 files changed, 7 insertions, 13 deletions

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 @@ class MirrorUrl(models.Model):
             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: