Merge lp:~cjwatson/isitdeployable/py3-syntax-and-imports into lp:isitdeployable

[Colin Watson]

Make various bits of syntax and standard library imports compatible with Python 3.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/isitdeployable-docker/21/

=== modified file 'requirements.txt'
--- requirements.txt	2017-10-03 15:08:45 +0000
+++ requirements.txt	2018-01-29 11:51:32 +0000
@@ -42,6 +42,7 @@
 pybars==0.0.4
 PyMeta==0.5.0
 pyinotify==0.9.3
+six==1.10.0
 soupmatchers==0.2
 testresources==0.2.5
 testtools==0.9.16
 
=== modified file 'revtracker/data.py'
--- revtracker/data.py	2016-09-27 14:31:46 +0000
+++ revtracker/data.py	2018-01-29 11:51:32 +0000
@@ -149,9 +149,9 @@
     child_revisions_needing_qa = Revision.objects.filter(
             status__exact=Revision.STATUS_UNKNOWN, parent__in=undeployed_revisions)
     revisions = list(child_revisions_needing_qa)
-    def is_unknown(rev):
-        return rev.status == rev.STATUS_UNKNOWN
-    revisions += filter(is_unknown, undeployed_revisions)
+    revisions += [
+        rev for rev in undeployed_revisions
+        if rev.status == rev.STATUS_UNKNOWN]
     return revisions
 
 
@@ -172,7 +172,7 @@
         pk is not in the dict for one of the input revisions,
         it indicates that the project isn't deployed.
     """
-    projects = map(operator.attrgetter('project'), revisions)
+    projects = [rev.project for rev in revisions]
     revnos = dict(Revision.objects.filter(project__in=projects,
         pk=F('project__deployed_revision')).values_list('project', 'revno'))
     return revnos
@@ -221,9 +221,9 @@
     if children:
         if revision.status in (revision.STATUS_BAD, revision.STATUS_UNKNOWN):
             status = revision.status
-        elif filter(lambda c: c.status==revision.STATUS_BAD, children):
+        elif any(c.status == revision.STATUS_BAD for c in children):
             status = revision.STATUS_BAD
-        elif filter(lambda c: c.status==revision.STATUS_UNKNOWN, children):
+        elif any(c.status == revision.STATUS_UNKNOWN for c in children):
             status = revision.STATUS_UNKNOWN
         else:
             status = revision.status
@@ -279,7 +279,7 @@
         then it will not be in the dict.
     """
     query = Revision.objects.filter(
-            parent__pk__in=map(operator.attrgetter('pk'), parents),
+            parent__pk__in=[rev.pk for rev in parents],
             ).extra(order_by=['branch', 'revno']).select_related('committer')
     child_map = {}
     for child in query:
@@ -298,7 +298,7 @@
         be in the dict.
     """
     parent_map = dict(Revision.objects.filter(
-            pk__in=map(operator.attrgetter('pk'), revisions)).exclude(
+            pk__in=[rev.pk for rev in revisions]).exclude(
             parent__exact=None,
             ).values_list('pk', 'parent__revno'))
     return parent_map
@@ -318,7 +318,7 @@
         return dict()
     content_type_id = ContentType.objects.get_for_model(revisions[0]).pk
     comments = Comment.objects.filter(content_type__exact=content_type_id,
-            object_pk__in=map(operator.attrgetter('pk'), revisions)).select_related('user')
+            object_pk__in=[rev.pk for rev in revisions]).select_related('user')
     comment_map = dict()
     for comment in comments:
         object_pk = int(comment.object_pk)
@@ -351,4 +351,4 @@
     else:
         requests = requests.order_by('-date_completed')
         requests = requests[:100]
-    return map(deployment_request_summary, requests)
+    return [deployment_request_summary(request) for request in requests]
 
=== modified file 'revtracker/models.py'
--- revtracker/models.py	2016-11-11 20:15:39 +0000
+++ revtracker/models.py	2018-01-29 11:51:32 +0000
@@ -46,7 +46,7 @@
 
 class Revision(models.Model):
 
-    (STATUS_UNKNOWN, STATUS_OK, STATUS_BAD, STATUS_UNTESTABLE) = range(4)
+    (STATUS_UNKNOWN, STATUS_OK, STATUS_BAD, STATUS_UNTESTABLE) = list(range(4))
 
     STATUS_CHOICES = (
         (STATUS_UNKNOWN, 'Unknown'),
@@ -124,7 +124,7 @@
 
 class DeploymentRequest(models.Model):
 
-    (STATUS_WAITING, STATUS_COMPLETE) = range(2)
+    (STATUS_WAITING, STATUS_COMPLETE) = list(range(2))
 
     STATUS_CHOICES = (
         (STATUS_WAITING, 'Waiting'),
 
=== modified file 'revtracker/tasks.py'
--- revtracker/tasks.py	2017-10-03 16:36:16 +0000
+++ revtracker/tasks.py	2018-01-29 11:51:32 +0000
@@ -1,15 +1,10 @@
 from __future__ import print_function
 
-from email.Utils import parseaddr
+from email.utils import parseaddr
 import os
 import re
 import shutil
 import tempfile
-from urlparse import (
-    unquote,
-    urlsplit,
-    urlunsplit,
-    )
 
 from bzrlib import (
     errors as bzr_errors,
@@ -24,6 +19,11 @@
 from django.contrib.auth.models import User
 from django.db.models import Max
 import pygit2
+from six.moves.urllib.parse import (
+    unquote,
+    urlsplit,
+    urlunsplit,
+    )
 
 from revtracker.launchpad import get_launchpad
 from revtracker.models import (
@@ -47,7 +47,7 @@
 
 class VCS(object):
 
-    (VCS_BAZAAR, VCS_GIT) = range(2)
+    (VCS_BAZAAR, VCS_GIT) = list(range(2))
 
 
 class LocalRevision(object):
 
=== modified file 'revtracker/tests/__init__.py'
--- revtracker/tests/__init__.py	2016-11-03 15:34:55 +0000
+++ revtracker/tests/__init__.py	2018-01-29 11:51:32 +0000
@@ -10,11 +10,6 @@
 
 import soupmatchers
 
-from test_api_helpers import *
-from test_data import *
-from test_templates import *
-from test_views import *
-
 
 class TestClient(Client):
 
 
=== modified file 'revtracker/tests/test_data.py'
--- revtracker/tests/test_data.py	2016-11-10 17:25:49 +0000
+++ revtracker/tests/test_data.py	2018-01-29 11:51:32 +0000
@@ -738,9 +738,7 @@
         revision = self.factory.make_one(Revision)
         children = self.factory.make(2, Revision, parent=revision,
                 branch="lp:foo", revno=1)
-        def load_rev(rev):
-            return Revision.objects.get(pk=rev.pk)
-        from_db = map(load_rev, children)
+        from_db = [Revision.objects.get(pk=rev.pk) for rev in children]
         self.assertNumQueries(1, data.get_parent_revnos, from_db)
 
 
 
=== modified file 'revtracker/tests/test_tasks.py'
--- revtracker/tests/test_tasks.py	2017-10-03 16:36:16 +0000
+++ revtracker/tests/test_tasks.py	2018-01-29 11:51:32 +0000
@@ -1,15 +1,15 @@
-from email.Utils import parseaddr
+from email.utils import parseaddr
 import os.path
 import shutil
 import tempfile
 from test.test_support import captured_stdout
-from urllib import pathname2url
 
 from bzrlib.controldir import ControlDir
 from bzrlib.tests import TestCaseWithTransport
 from django.test.utils import override_settings
 from django_factory import TestCase
 import pygit2
+from six.moves.urllib.request import pathname2url
 from testscenarios import WithScenarios
 from testtools.matchers import (
     MatchesSetwise,
 
=== modified file 'revtracker/tests/test_views.py'
--- revtracker/tests/test_views.py	2016-09-22 12:39:14 +0000
+++ revtracker/tests/test_views.py	2018-01-29 11:51:32 +0000
@@ -165,7 +165,7 @@
         so_far = len(connection.queries)
         try:
             super(GetProjectInfoTests, self).assertNumQueries(*args, **kwargs)
-        except AssertionError, e:
+        except AssertionError as e:
             e.mismatch.annotation += ", Queries were:\n%s" % "\n".join(
                 map(itemgetter('sql'), connection.queries[so_far:]))
             raise e
 
=== modified file 'revtracker/tests/test_views_logged_in.py'
--- revtracker/tests/test_views_logged_in.py	2016-11-03 15:38:36 +0000
+++ revtracker/tests/test_views_logged_in.py	2018-01-29 11:51:32 +0000
@@ -6,7 +6,7 @@
 
 from ..models import Project, Revision
 
-from . import(
+from . import (
     IndexProject,
     IndexProjectsList,
     RevTrackerTestCase,
@@ -20,7 +20,7 @@
     ProjectRevisionSetRollbackForm
     )
 
-from test_api_helpers import User
+from .test_api_helpers import User
 
 
 class IndexViewTests(RevTrackerTestCase):
 
=== modified file 'revtracker/views.py'
--- revtracker/views.py	2016-11-03 21:24:00 +0000
+++ revtracker/views.py	2018-01-29 11:51:32 +0000
@@ -162,7 +162,7 @@
     comment_form = CommentForm(revision)
     info['comment_form'] = comment_form.generate_security_data()
     info['comment_form']['url'] = reverse('comments-post-comment')
-    info['comments'] = map(comment_to_info, comments)
+    info['comments'] = [comment_to_info(comment) for comment in comments]
     return info
 
 
@@ -180,14 +180,14 @@
     def child_info(rev):
         comments = comment_map.get(rev.pk, [])
         return project_revision_to_info(project, rev, [], comments, show_deployability=True)
-    info['child_revisions'] = map(child_info, child_revisions)
+    info['child_revisions'] = [child_info(rev) for rev in child_revisions]
     return info
 
 
 def index_data():
     projects = Project.objects.all().select_related('revision_set')
     info = dict()
-    info['projects'] = map(index_project_to_info, projects)
+    info['projects'] = [index_project_to_info(project) for project in projects]
     return info
 
 
@@ -218,7 +218,7 @@
     def make_rev_info(rev):
         rev_children = child_revisions.get(rev.pk, [])
         return project_revision_to_info_with_children(project, rev, rev_children, comment_map)
-    info['undeployed_revisions'] = map(make_rev_info, undeployed_revisions)
+    info['undeployed_revisions'] = [make_rev_info(rev) for rev in undeployed_revisions]
     return info
 
 
@@ -341,11 +341,11 @@
     def make_rev_info(rev):
         rev_children = child_revisions.get(rev.pk, [])
         return project_revision_to_info_with_children(dr.project, rev, rev_children, comment_map)
-    info['deploy_revisions'] = map(make_rev_info, deploy_revisions)
+    info['deploy_revisions'] = [make_rev_info(rev) for rev in deploy_revisions]
     def check_deployability(rev):
         rev_children = child_revisions.get(rev.pk, [])
         return data.revision_is_deployable(rev, rev_children)
-    bad_revisions = filter(lambda x: not x, map(check_deployability, deploy_revisions))
+    bad_revisions = [rev for rev in deploy_revisions if not check_deployability(rev)]
     if bad_revisions:
         info['not_ok_revisions_count'] = len(bad_revisions)
     info['not_deployable'] = bool(bad_revisions)
@@ -452,12 +452,12 @@
             if parent_revno <= deployed_revnos[rev.project.pk]:
                 return False
         return True
-    revisions = filter(is_undeployed, revisions)
+    revisions = [rev for rev in revisions if is_undeployed(rev)]
     def make_rev_info(rev):
         return project_revision_to_info(rev.project, rev,
                 child_revisions.get(rev.pk, []), comment_map.get(rev.pk, []),
                 show_deployability=True)
-    info['revisions_needing_qa'] = map(make_rev_info, revisions)
+    info['revisions_needing_qa'] = [make_rev_info(rev) for rev in revisions]
     return info
 
 
@@ -527,9 +527,8 @@
     project = get_project(project_name)
     info = checklist_data.checklist_info(project.deployment_checklist)
     sub_links = project_sub_links(project)
-    def markdownize_description(step):
-        return markdownize_for_editor(step, 'description')
-    info['steps'] = map(markdownize_description, info['steps'])
+    info['steps'] = [
+        markdownize_for_editor(step, 'description') for step in info['steps']]
     content = render_template('revtracker/checklist.html', info,
             get_partials(), get_helpers(request))
     return HttpResponse(render_page('Deploying %s' % str(project.name),
 
=== modified file 'setup.py'
--- setup.py	2016-09-27 14:31:46 +0000
+++ setup.py	2018-01-29 11:51:32 +0000
@@ -33,6 +33,7 @@
         'oops_celery',
         'oops-wsgi',
         'pygit2>=0.23.2',
+        'six',
         ],
     zip_safe=False,
     packages=find_packages(),