Merge lp:~lool/launchpad-work-items-tracker/fix-line-wrap-breakage into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Loïc Minier]

Latest changes have broken ./collect due to some copy-paste regression between staging and main linaro branch (sorry); this fixes it and also makes collect entirely PEP8 clean (some line too long warnings remained).

[Milo Casagrande (milo)]

Looks good, merging now.

review: Approve

=== modified file 'collect'
--- collect	2012-07-10 16:24:31 +0000
+++ collect	2012-08-03 13:24:24 +0000
@@ -209,6 +209,7 @@
 
 
 def lp_import_blueprint_workitems(collector, bp, distro_release,
+                                  people_cache=None, projects=None):
     '''Collect work items from a Launchpad blueprint.
 
     This includes work items from the whiteboard as well as linked bugs.
@@ -333,7 +334,8 @@
                 member.name, team.name)
             if recursive or team.name in cfg.get('recursive_teams', []):
                 _import_teams_recurse(
-                        collector, cfg, member, top_level_team_names + [member.name],
+                        collector, cfg, member,
+                        top_level_team_names + [member.name],
                         people_cache=people_cache, recursive=True)
 
 
@@ -371,12 +373,14 @@
     blueprint.status = lp_project.summary or name
     collector.store_blueprint(blueprint)
 
-    for task in lp_project.searchTasks(status=bug_wi_states.keys(), **cfg['work_item_bugs']):
+    for task in lp_project.searchTasks(status=bug_wi_states.keys(),
+                                       **cfg['work_item_bugs']):
         id = task.self_link.split('/')[-1]
         title = task.title.split('"', 1)[1].rstrip('"')
         state = bug_wi_states[task.status]
         if state is None:
-            dbg('lp_import_bug_workitems: ignoring #%s: %s (status: %s)' % (id, title, task.status))
+            dbg('lp_import_bug_workitems: ignoring #%s: %s (status: %s)' % (
+                    id, title, task.status))
             continue
         dbg('lp_import_bug_workitems: #%s: %s (%s)' % (id, title, state))
 
@@ -409,14 +413,17 @@
         milestones.extend([ms for ms in project.all_milestones])
 
     if 'release' in cfg:
-        lp_project = collector.lp.distributions['ubuntu'].getSeries(name_or_version=cfg['release'])
+        lp_project = collector.lp.distributions['ubuntu'].getSeries(
+                         name_or_version=cfg['release'])
         projects.append((lp_project, None))
         add_milestones(lp_project)
     else:
-        assert 'project' in cfg, 'Configuration needs to specify project or release'
+        assert 'project' in cfg, \
+            'Configuration needs to specify project or release'
         lp_project = collector.lp.projects[cfg['project']]
         if 'project_series' in cfg:
-            lp_project_series = lp_project.getSeries(name=cfg['project_series'])
+            lp_project_series = lp_project.getSeries(
+                 name=cfg['project_series'])
             add_milestones(lp_project_series)
         else:
             lp_project_series = None
@@ -482,10 +489,12 @@
 
     for project, series in projects:
     # XXX: should this be valid_ or all_specifications?
-        project_spec_group_matcher = spec_group_matchers.get(project.name, None)
+        project_spec_group_matcher = spec_group_matchers.get(project.name,
+                                                             None)
         project_bps = project.valid_specifications
         for bp in project_bps:
-            if name_pattern is not None and re.search(name_pattern, bp.name) is None:
+            if name_pattern is not None and \
+                re.search(name_pattern, bp.name) is None:
                 continue
             if project_spec_group_matcher is not None:
                 match = re.search(project_spec_group_matcher, bp.name)
@@ -500,7 +509,8 @@
                 add_blueprint(bp)
         if series is not None:
             for bp in series.valid_specifications:
-                if name_pattern is not None and re.search(name_pattern, bp.name) is None:
+                if name_pattern is not None and \
+                    re.search(name_pattern, bp.name) is None:
                     continue
                 if project_spec_group_matcher is not None:
                     match = re.search(project_spec_group_matcher, bp.name)
@@ -596,7 +606,8 @@
             else:
                 status_search = fields[2:]
             for f in status_search:
-                if u'DONE' in f or u'POSTPONED' in f or u'TODO' in f or u'INPROGRESS' in f or u'BLOCKED' in f:
+                if u'DONE' in f or u'POSTPONED' in f or u'TODO' in f or \
+                    u'INPROGRESS' in f or u'BLOCKED' in f:
                     ff = f.split()
                     if len(ff) == 2:
                         assignee = ff[1]
@@ -645,14 +656,17 @@
     for url, default_assignee in cfg.get('moin_pages', {}).iteritems():
         url = unicode_or_None(url)
         default_assignee = unicode_or_None(default_assignee)
-        dbg('moin_import(): processing %s (default assignee: %s)' % (url, default_assignee))
-        for group, status, items in get_moin_workitems_group(url, default_assignee):
+        dbg('moin_import(): processing %s (default assignee: %s)' % (
+                url, default_assignee))
+        for group, status, items in get_moin_workitems_group(url,
+                                                             default_assignee):
             url_clean = url.replace('?action=raw', '')
             name = url_clean.split('://', 1)[1].split('/', 1)[1]
             if group:
                 name += u' ' + group
                 spec_url = u'%s#%s' % (url_clean, escape_url(group))
-                dbg('  got group %s: name="%s", url="%s"' % (group, name, spec_url))
+                dbg('  got group %s: name="%s", url="%s"' % (
+                        group, name, spec_url))
             else:
                 spec_url = url_clean
                 dbg('  no group: name="%s", url="%s"' % (name, spec_url))
@@ -691,7 +705,8 @@
     optparser.add_option('-c', '--config',
         help='Path to configuration file', dest='config', metavar='PATH')
     optparser.add_option('-p', '--pattern', metavar='REGEX',
-        help='Regex pattern for blueprint name (optional, mainly for testing)', dest='pattern')
+        help='Regex pattern for blueprint name (optional, mainly for testing)',
+        dest='pattern')
     optparser.add_option('--debug', action='store_true', default=False,
         help='Enable debugging output in parsing routines')
     optparser.add_option('--mail', action='store_true', default=False,
@@ -729,24 +744,30 @@
         project_name = error.get_project_name()
         if project_name is not None:
             addresses = cfg['project_notification_addresses'][project_name]
-            dbg('spec %s is targetted to "%s", mailing to %s' % (error.get_blueprint_name(),
-                                                                 project_name, ', '.join(addresses)))
+            dbg('spec %s is targetted to "%s", mailing to %s' % (
+                    error.get_blueprint_name(), project_name,
+                    ', '.join(addresses)))
             for a in addresses:
                 emails.setdefault(a, '')
                 emails[a] += error.format_for_display() + '\n'
         else:
-            print >> sys.stderr, error.format_for_display(), '(no error_contact pattern)'
+            print >> sys.stderr, error.format_for_display(), \
+                '(no error_contact pattern)'
 
     # send mails
     for addr, contents in emails.iteritems():
         msg = MIMEText(contents.encode('ascii', 'replace'))
         msg['Subject'] = 'Errors in work item definitions'
-        msg['From'] = 'Launchpad work item tracker <[e-mail]>'
+        msg['From'] = 'Launchpad work item tracker ' + \
+            '<[e-mail]>'
         msg['To'] = addr
         s = smtplib.SMTP()
         s.connect()
-        s.sendmail(os.environ.get('EMAIL', pwd.getpwuid(os.geteuid()).pw_name + '@localhost'),
-                addr, msg.as_string())
+        s.sendmail(os.environ.get(
+                       'EMAIL',
+                       pwd.getpwuid(os.geteuid()).pw_name + '@localhost'),
+                   addr,
+                   msg.as_string())
         s.quit()
 
 
@@ -793,9 +814,14 @@
         sys.exit(0)
 
     if "beta" in EDGE_SERVICE_ROOT:
-        lp = Launchpad.login_with('ubuntu-work-items', service_root=EDGE_SERVICE_ROOT.replace("edge.", "").replace("beta", "devel"))
+        service_root = EDGE_SERVICE_ROOT
+        service_root = service_root.replace("edge.", "")
+        service_root = service_root.replace("beta", "devel")
+        lp = Launchpad.login_with('ubuntu-work-items',
+                                  service_root=service_root)
     else:
-        lp = Launchpad.login_with('ubuntu-work-items', service_root="production", version="devel")
+        lp = Launchpad.login_with('ubuntu-work-items',
+                                  service_root="production", version="devel")
 
     store = get_store(opts.database)
     collector = CollectorStore(store, lp, error_collector)