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>
---
 main/log.py                               |  1 -
 main/migrations/0029_fill_in_repo_data.py |  1 -
 main/models.py                            | 12 +++++-------
 main/utils.py                             |  1 -
 4 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'main')

diff --git a/main/log.py b/main/log.py
index 6363487..5c745cc 100644
--- a/main/log.py
+++ b/main/log.py
@@ -46,7 +46,6 @@ class RateLimitFilter(object):
 
         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 0887b28..7da6b1c 100644
--- a/main/migrations/0029_fill_in_repo_data.py
+++ b/main/migrations/0029_fill_in_repo_data.py
@@ -7,7 +7,6 @@ from django.db import models
 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 89215f0..24aeed8 100644
--- a/main/models.py
+++ b/main/models.py
@@ -7,7 +7,6 @@ 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
 
 from .fields import PositiveBigIntegerField
 from .utils import set_created_field
@@ -140,7 +139,7 @@ class Package(models.Model):
     @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 @@ class Package(models.Model):
         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 @@ class Package(models.Model):
         '''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 8394e5c..9ee8db5 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -3,7 +3,6 @@ try:
 except ImportError:
     import pickle
 
-from datetime import datetime
 import hashlib
 
 from django.core.cache import cache
-- 
cgit v1.2.3-24-g4f1b