Merge pull request #132 from akstrfn/python3

Some py3 fixes and some refactoring

7 files changed, 12 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index b19b099d..e047ef4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@ collected_static/
 testing/
 env/
 
+.mypy_cache/
+
 # rope
 .ropeproject/
 
diff --git a/devel/forms.py b/devel/forms.py
index e6ccf68b..21ce529e 100644
--- a/devel/forms.py
+++ b/devel/forms.py
@@ -53,15 +53,11 @@ class NewUserForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(NewUserForm, self).__init__(*args, **kwargs)
         # Hack ourself so certain fields appear first
-        old = self.fields
-        self.fields = OrderedDict()
         keys = ('username', 'private_email', 'first_name', 'last_name',
                 'alias', 'public_email')
-        for key in keys:
-            self.fields[key] = old[key]
-        for key, _ in list(old.items()):
-            if key not in keys:
-                self.fields[key] = old[key]
+        # add all remaining keys afterwards
+        keys += tuple(k for k in self.fields.keys() if k not in keys)
+        self.fields = OrderedDict((key, old[key]) for key in keys)
 
     def clean_username(self):
         username = self.cleaned_data['username']
diff --git a/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py
index 455bbe69..2188de3c 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 list(keydata.values()):
+        for data in 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 list(other.items()):
+                for k, v in 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 9fd7acf1..7178d1d8 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 list(mapping.items()):
+    for packager_str, user in 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 list(mapping.items()):
+    for user_email, user in mapping.items():
         req_count += FlagRequest.objects.filter(user__isnull=True,
                 user_email=user_email).update(user=user)
 
diff --git a/devel/management/commands/reporead_inotify.py b/devel/management/commands/reporead_inotify.py
index eb183060..fadcb881 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 list(arch_paths.items()):
+        for arch, paths in arch_paths.items():
             self.arch_lookup.update((path.rstrip('/'), arch) for path in paths)
 
     def process_default(self, event):
diff --git a/main/templatetags/details_link.py b/main/templatetags/details_link.py
index 948af314..2e68befe 100644
--- a/main/templatetags/details_link.py
+++ b/main/templatetags/details_link.py
@@ -8,7 +8,7 @@ register = template.Library()
 def link_encode(url, query):
     # massage the data into all utf-8 encoded strings first, so urlencode
     # doesn't barf at the data we pass it
-    query = {k: str(v).encode('utf-8') for k, v in list(query.items())}
+    query = {k: str(v).encode('utf-8') for k, v in query.items()}
     data = urlencode(query)
     return "%s?%s" % (url, data)
 
diff --git a/public/utils.py b/public/utils.py
index cf768129..248bd7d8 100644
--- a/public/utils.py
+++ b/public/utils.py
@@ -48,7 +48,7 @@ class RecentUpdate(object):
             by_arch = defaultdict(list)
             for package in self.others:
                 by_arch[package.arch].append(package)
-            for _, packages in list(by_arch.items()):
+            for _, packages in by_arch.items():
                 if len(packages) == 1:
                     yield packages[0]
                 else: