main: run 2to3

6 files changed, 13 insertions, 13 deletions

diff --git a/devel/forms.py b/devel/forms.py
index db4428fa..e6ccf68b 100644
--- a/devel/forms.py
+++ b/devel/forms.py
@@ -59,7 +59,7 @@ class NewUserForm(forms.ModelForm):
                 'alias', 'public_email')
         for key in keys:
             self.fields[key] = old[key]
-        for key, _ in old.items():
+        for key, _ in list(old.items()):
             if key not in keys:
                 self.fields[key] = old[key]
 
diff --git a/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py
index 2188de3c..455bbe69 100644
--- a/devel/management/commands/pgp_import.py
+++ b/devel/management/commands/pgp_import.py
@@ -141,7 +141,7 @@ def import_keys(keyring):
         finder = UserFinder()
         # we are dependent on parents coming before children; parse_keydata
         # uses an OrderedDict to ensure this is the case.
-        for data in keydata.values():
+        for data in list(keydata.values()):
             parent_id = None
             if data.parent:
                 parent_data = keydata.get(data.parent, None)
@@ -161,7 +161,7 @@ def import_keys(keyring):
             if created:
                 created_ct += 1
             else:
-                for k, v in other.items():
+                for k, v in list(other.items()):
                     if getattr(dkey, k) != v:
                         setattr(dkey, k, v)
                         needs_save = True
diff --git a/devel/management/commands/rematch_developers.py b/devel/management/commands/rematch_developers.py
index 7178d1d8..9fd7acf1 100644
--- a/devel/management/commands/rematch_developers.py
+++ b/devel/management/commands/rematch_developers.py
@@ -62,7 +62,7 @@ def match_packager(finder):
             logger.debug("  found user %s", user.username)
             matched_count += 1
 
-    for packager_str, user in mapping.items():
+    for packager_str, user in list(mapping.items()):
         package_count += Package.objects.filter(packager__isnull=True,
                 packager_str=packager_str).update(packager=user)
 
@@ -88,7 +88,7 @@ def match_flagrequest(finder):
             logger.debug("  found user %s", user.username)
             matched_count += 1
 
-    for user_email, user in mapping.items():
+    for user_email, user in list(mapping.items()):
         req_count += FlagRequest.objects.filter(user__isnull=True,
                 user_email=user_email).update(user=user)
 
diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
index 37ba10d8..e2f6cb48 100644
--- a/devel/management/commands/reporead.py
+++ b/devel/management/commands/reporead.py
@@ -107,12 +107,12 @@ class RepoPackage(object):
         self.files = None
 
     def populate(self, values):
-        for k, v in values.iteritems():
+        for k, v in values.items():
             # ensure we stay under our DB character limit
             if k in self.bare:
                 setattr(self, k, v[0][:254])
             elif k in self.number:
-                setattr(self, k, long(v[0]))
+                setattr(self, k, int(v[0]))
             elif k in ('desc', 'pgpsig'):
                 # do NOT prune these values at all
                 setattr(self, k, v[0])
@@ -145,8 +145,8 @@ class RepoPackage(object):
     def full_version(self):
         '''Very similar to the main.models.Package method.'''
         if self.epoch > 0:
-            return u'%d:%s-%s' % (self.epoch, self.ver, self.rel)
-        return u'%s-%s' % (self.ver, self.rel)
+            return '%d:%s-%s' % (self.epoch, self.ver, self.rel)
+        return '%s-%s' % (self.ver, self.rel)
 
 
 DEPEND_RE = re.compile(r"^(.+?)((>=|<=|=|>|<)(.+))?$")
@@ -573,7 +573,7 @@ def parse_repo(repopath):
 
     repodb.close()
     logger.info("Finished repo parsing, %d total packages", len(pkgs))
-    return (reponame, pkgs.values())
+    return (reponame, list(pkgs.values()))
 
 def locate_arch(arch):
     "Check if arch is valid."
diff --git a/devel/management/commands/reporead_inotify.py b/devel/management/commands/reporead_inotify.py
index fadcb881..eb183060 100644
--- a/devel/management/commands/reporead_inotify.py
+++ b/devel/management/commands/reporead_inotify.py
@@ -187,7 +187,7 @@ class EventHandler(pyinotify.ProcessEvent):
 
         # we really want a single path to arch mapping, so massage the data
         arch_paths = kwargs['arch_paths']
-        for arch, paths in arch_paths.items():
+        for arch, paths in list(arch_paths.items()):
             self.arch_lookup.update((path.rstrip('/'), arch) for path in paths)
 
     def process_default(self, event):
diff --git a/devel/models.py b/devel/models.py
index 4322df06..b5300d07 100644
--- a/devel/models.py
+++ b/devel/models.py
@@ -95,7 +95,7 @@ class MasterKey(models.Model):
         get_latest_by = 'created'
 
     def __unicode__(self):
-        return u'%s, created %s' % (
+        return '%s, created %s' % (
                 self.owner.get_full_name(), self.created)
 
 
@@ -128,7 +128,7 @@ class PGPSignature(models.Model):
         verbose_name = 'PGP signature'
 
     def __unicode__(self):
-        return u'%s → %s' % (self.signer, self.signee)
+        return '%s → %s' % (self.signer, self.signee)
 
 
 pre_save.connect(set_created_field, sender=UserProfile,