main: run 2to3

6 files changed, 36 insertions, 36 deletions

diff --git a/packages/alpm.py b/packages/alpm.py
index 027fadc9..7be096c7 100644
--- a/packages/alpm.py
+++ b/packages/alpm.py
@@ -64,9 +64,9 @@ class AlpmAPI(object):
 
 def main(): # pragma: no cover
     api = AlpmAPI()
-    print(api.version())
-    print(api.vercmp(1, 2))
-    print(api.compare_versions(1, '<', 2))
+    print((api.version()))
+    print((api.vercmp(1, 2)))
+    print((api.compare_versions(1, '<', 2)))
 
 
 if __name__ == '__main__': # pragma: no cover
diff --git a/packages/models.py b/packages/models.py
index 04ad7adb..10808faa 100644
--- a/packages/models.py
+++ b/packages/models.py
@@ -42,7 +42,7 @@ class PackageRelation(models.Model):
         return Update.objects.filter(pkgbase=self.pkgbase).latest()
 
     def __unicode__(self):
-        return u'%s: %s (%s)' % (
+        return '%s: %s (%s)' % (
                 self.pkgbase, self.user, self.get_type_display())
 
 
@@ -94,11 +94,11 @@ class SignoffSpecification(models.Model):
     @property
     def full_version(self):
         if self.epoch > 0:
-            return u'%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel)
-        return u'%s-%s' % (self.pkgver, self.pkgrel)
+            return '%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel)
+        return '%s-%s' % (self.pkgver, self.pkgrel)
 
     def __unicode__(self):
-        return u'%s-%s' % (self.pkgbase, self.full_version)
+        return '%s-%s' % (self.pkgbase, self.full_version)
 
 
 # Fake signoff specs for when we don't have persisted ones in the database.
@@ -109,7 +109,7 @@ FakeSignoffSpecification = namedtuple('FakeSignoffSpecification',
 
 
 def fake_signoff_spec(arch):
-    return FakeSignoffSpecification(arch.required_signoffs, True, False, u'')
+    return FakeSignoffSpecification(arch.required_signoffs, True, False, '')
 
 
 class SignoffManager(models.Manager):
@@ -163,14 +163,14 @@ class Signoff(models.Model):
     @property
     def full_version(self):
         if self.epoch > 0:
-            return u'%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel)
-        return u'%s-%s' % (self.pkgver, self.pkgrel)
+            return '%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel)
+        return '%s-%s' % (self.pkgver, self.pkgrel)
 
     def __unicode__(self):
-        revoked = u''
+        revoked = ''
         if self.revoked:
-            revoked = u' (revoked)'
-        return u'%s-%s: %s%s' % (
+            revoked = ' (revoked)'
+        return '%s-%s: %s%s' % (
                 self.pkgbase, self.full_version, self.user, revoked)
 
 
@@ -208,10 +208,10 @@ class FlagRequest(models.Model):
         # handle the case of pkgver and pkgrel being null as this table didn't
         # originally have version columns.
         if self.pkgver == '' and self.pkgrel == '':
-            return u''
+            return ''
         if self.epoch > 0:
-            return u'%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel)
-        return u'%s-%s' % (self.pkgver, self.pkgrel)
+            return '%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel)
+        return '%s-%s' % (self.pkgver, self.pkgrel)
 
     def get_associated_packages(self):
         return Package.objects.normal().filter(
@@ -221,7 +221,7 @@ class FlagRequest(models.Model):
                 'pkgname', 'repo__name', 'arch__name')
 
     def __unicode__(self):
-        return u'%s from %s on %s' % (self.pkgbase, self.who(), self.created)
+        return '%s from %s on %s' % (self.pkgbase, self.who(), self.created)
 
 
 class UpdateManager(models.Manager):
@@ -313,16 +313,16 @@ class Update(models.Model):
         if self.action_flag == ADDITION:
             return None
         if self.old_epoch > 0:
-            return u'%d:%s-%s' % (self.old_epoch, self.old_pkgver, self.old_pkgrel)
-        return u'%s-%s' % (self.old_pkgver, self.old_pkgrel)
+            return '%d:%s-%s' % (self.old_epoch, self.old_pkgver, self.old_pkgrel)
+        return '%s-%s' % (self.old_pkgver, self.old_pkgrel)
 
     @property
     def new_version(self):
         if self.action_flag == DELETION:
             return None
         if self.new_epoch > 0:
-            return u'%d:%s-%s' % (self.new_epoch, self.new_pkgver, self.new_pkgrel)
-        return u'%s-%s' % (self.new_pkgver, self.new_pkgrel)
+            return '%d:%s-%s' % (self.new_epoch, self.new_pkgver, self.new_pkgrel)
+        return '%s-%s' % (self.new_pkgver, self.new_pkgrel)
 
     def elsewhere(self):
         return Package.objects.normal().filter(
@@ -343,7 +343,7 @@ class Update(models.Model):
                 self.arch.name, self.pkgname)
 
     def __unicode__(self):
-        return u'%s of %s on %s' % (self.get_action_flag_display(),
+        return '%s of %s on %s' % (self.get_action_flag_display(),
                 self.pkgname, self.created)
 
 
@@ -457,7 +457,7 @@ class RelatedToBase(models.Model):
 
     def __unicode__(self):
         if self.version:
-            return u'%s%s%s' % (self.name, self.comparison, self.version)
+            return '%s%s%s' % (self.name, self.comparison, self.version)
         return self.name
 
     class Meta:
@@ -483,7 +483,7 @@ class Depend(RelatedToBase):
         '''For depends, we may also have a description and a modifier.'''
         to_str = super(Depend, self).__unicode__()
         if self.description:
-            return u'%s: %s' % (to_str, self.description)
+            return '%s: %s' % (to_str, self.description)
         return to_str
 
 
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index bc66390e..1cccc2bd 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -19,7 +19,7 @@ class BuildQueryStringNode(template.Node):
         # have simply u'\u2603' or a byte string of the UTF-8 value. Force the
         # keys and list of values to be byte strings only.
         qs = {k.encode('latin-1'): [v.encode('latin-1') for v in vals]
-                for k, vals in qs.items()}
+                for k, vals in list(qs.items())}
         if 'sort' in qs and self.sortfield in qs['sort']:
             if self.sortfield.startswith('-'):
                 qs['sort'] = [self.sortfield[1:]]
diff --git a/packages/tests.py b/packages/tests.py
index c41db99a..fe47f24b 100644
--- a/packages/tests.py
+++ b/packages/tests.py
@@ -80,7 +80,7 @@ class PackageSearchJson(TestCase):
         self.assertEqual(response.status_code, 200)
         data = response.json()
         self.assertEqual(len(data['results']), 5)
-        self.assertEqual(set(map(lambda r: r['pkgname'], data['results'])),
+        self.assertEqual(set([r['pkgname'] for r in data['results']]),
                          {"coreutils", "glibc", "linux", "pacman", "systemd"})
 
     def test_packagename(self):
diff --git a/packages/utils.py b/packages/utils.py
index dbf8b90c..c1f328f3 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -50,8 +50,8 @@ def get_group_info(include_arches=None):
     if 'any' in group_mapping:
         any_groups = group_mapping['any']
         del group_mapping['any']
-        for arch, arch_groups in group_mapping.iteritems():
-            for grp in any_groups.itervalues():
+        for arch, arch_groups in group_mapping.items():
+            for grp in any_groups.values():
                 if grp['name'] in arch_groups:
                     found = arch_groups[grp['name']]
                     found['count'] += grp['count']
@@ -66,9 +66,9 @@ def get_group_info(include_arches=None):
     # now transform it back into a sorted list, including only the specified
     # architectures if we got a list
     groups = []
-    for key, val in group_mapping.iteritems():
+    for key, val in group_mapping.items():
         if not include_arches or key in include_arches:
-            groups.extend(val.itervalues())
+            groups.extend(iter(val.values()))
     return sorted(groups, key=itemgetter('name', 'arch'))
 
 
@@ -318,7 +318,7 @@ class PackageSignoffGroup(object):
         return user in (s.user for s in self.signoffs if not s.revoked)
 
     def __unicode__(self):
-        return u'%s-%s (%s): %d' % (
+        return '%s-%s (%s): %d' % (
                 self.pkgbase, self.version, self.arch, len(self.signoffs))
 
 
@@ -352,14 +352,14 @@ SELECT DISTINCT s.id
 def get_current_signoffs(repos):
     '''Returns a list of signoff objects for the given repos.'''
     to_fetch = signoffs_id_query(Signoff, repos)
-    return Signoff.objects.select_related('user').in_bulk(to_fetch).values()
+    return list(Signoff.objects.select_related('user').in_bulk(to_fetch).values())
 
 
 def get_current_specifications(repos):
     '''Returns a list of signoff specification objects for the given repos.'''
     to_fetch = signoffs_id_query(SignoffSpecification, repos)
-    return SignoffSpecification.objects.select_related('arch').in_bulk(
-            to_fetch).values()
+    return list(SignoffSpecification.objects.select_related('arch').in_bulk(
+            to_fetch).values())
 
 
 def get_target_repo_map(repos):
@@ -450,7 +450,7 @@ class PackageJSONEncoder(DjangoJSONEncoder):
         if isinstance(obj, (PackageGroup, License)):
             return obj.name
         if isinstance(obj, (Depend, Conflict, Provision, Replacement)):
-            return unicode(obj)
+            return str(obj)
         elif isinstance(obj, User):
             return obj.username
         return super(PackageJSONEncoder, self).default(obj)
diff --git a/packages/views/signoff.py b/packages/views/signoff.py
index 8596fa9f..db20f697 100644
--- a/packages/views/signoff.py
+++ b/packages/views/signoff.py
@@ -166,7 +166,7 @@ class SignoffJSONEncoder(DjangoJSONEncoder):
         elif isinstance(obj, Signoff):
             return {attr: getattr(obj, attr) for attr in self.signoff_attrs}
         elif isinstance(obj, Arch) or isinstance(obj, Repo):
-            return unicode(obj)
+            return str(obj)
         elif isinstance(obj, User):
             return obj.username
         elif isinstance(obj, set):