Merge lp:~milo/launchpad-work-items-tracker/bug1017878 into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Данило Шеган]

Paraphrasing Milo from https://code.launchpad.net/~milo/launchpad-work-items-tracker/bug1017878/+merge/112784

"Hi,

the following branch should fix bug 1017878. I basically applied an old Danilo patch: what we are doing now is storing in the DB the new milestone, if it is not there already.

I fixed also some PEP8 warnings, but definitely not all."

[Данило Шеган (danilo)]

Thanks for all the pep8 fixes as well, looks good!

review: Approve

[Milo Casagrande (milo)]

Hey Danilo, thanks for moving this MP here!

=== modified file 'collect'
--- collect	2012-03-26 11:42:08 +0000
+++ collect	2012-06-29 16:13:29 +0000
@@ -6,13 +6,25 @@
 # Copyright (C) 2010, 2011 Canonical Ltd.
 # License: GPL-3
 
-import urllib, re, sys, optparse, smtplib, pwd, os, urlparse
+import urllib
+import re
+import sys
+import optparse
+import smtplib
+import pwd
+import os
+import urlparse
 import logging
 from email.mime.text import MIMEText
 
 from launchpadlib.launchpad import Launchpad, EDGE_SERVICE_ROOT
 
-from lpworkitems.collect import CollectorStore, PersonCache, WorkitemParser, bug_wi_states
+from lpworkitems.collect import (
+    CollectorStore,
+    PersonCache,
+    WorkitemParser,
+    bug_wi_states
+)
 from lpworkitems.database import get_store
 from lpworkitems.error_collector import (
     BlueprintURLError,
@@ -65,6 +77,8 @@
 
 import simplejson
 _orig_loads = simplejson.loads
+
+
 def loads(something):
     return _orig_loads(unicode_or_None(something))
 simplejson.loads = loads
@@ -119,9 +133,9 @@
     add_dependencies(collector, model_group.name, deps)
     return model_group
 
+
 def parse_meta_item(collector, line, bp_name):
     '''Parse a meta information line from a blueprint
-
     '''
 
     line = line.strip()
@@ -130,13 +144,13 @@
 
     try:
         (key, value) = line.rsplit(':', 1)
-        key   = key.strip()
+        key = key.strip()
         value = value.strip()
     except ValueError:
         dbg("\tMeta line '%s' can not be parsed" % line)
         return
 
-    dbg( "\t\tMeta for %s: key='%s' value='%s'" % (bp_name, key, value) )
+    dbg("\t\tMeta for %s: key='%s' value='%s'" % (bp_name, key, value))
     collector.store_meta(key, value, bp_name)
 
 
@@ -149,9 +163,9 @@
 
     dbg("\tParsing complexity line '%s'" % line)
 
-    num         = None
-    milestone   = None
-    assignee    = None
+    num = None
+    milestone = None
+    assignee = None
 
     try:
         complexity_list = line.split()
@@ -181,6 +195,7 @@
             return word
     return None
 
+
 def lp_import_blueprint_workitems(collector, bp, distro_release, people_cache=None, projects=None):
     '''Collect work items from a Launchpad blueprint.
 
@@ -489,7 +504,6 @@
                 deps[possible_dep] = possible_deps[possible_dep]
         if deps:
             lp_import_spec_group(collector, spec_group, area, deps)
-
     lp_import_bug_workitems(lp_project, collector, cfg)
 
 
@@ -537,7 +551,8 @@
             if in_section:
                 result.append([name, status, section])
             fields = line.strip().split(u'==')
-            assert not fields[0] # should be empty
+            # should be empty
+            assert not fields[0]
             name = fields[1].strip()
             section = []
             collect = 1
@@ -547,7 +562,8 @@
                 in_section = True
             collect = 0
             fields = line.strip().split(u'||')
-            assert not fields[0] # should be empty
+            # should be empty
+            assert not fields[0]
             assignee = default_assignee
             istatus = u'todo'
             milestone = None
@@ -559,7 +575,7 @@
             desc = fields[which].strip()
             if u'status' in field_off:
                 which = field_off[u'status']
-                status_search = [ fields[which] ]
+                status_search = [fields[which]]
             else:
                 status_search = fields[2:]
             for f in status_search:
@@ -676,10 +692,11 @@
 
     return opts, args
 
+
 def send_error_mails(cfg):
     '''Send data_errors to contacts.
 
-    Data error contacts are defined in the configuration in the 
+    Data error contacts are defined in the configuration in the
     "project_notification_addresses" map (which assigns project names to a list
     of email addresses). If no address list for a project is found, the error
     goes to stderr.
@@ -687,7 +704,8 @@
     global error_collector
 
     # sort errors into address buckets
-    emails = {} # email address -> contents
+    # email address -> contents
+    emails = {}
 
     dbg('mailing %i data errors' % len(error_collector.errors))
     for error in error_collector.errors:

=== modified file 'lpworkitems/collect.py'
--- lpworkitems/collect.py	2012-03-05 14:32:43 +0000
+++ lpworkitems/collect.py	2012-06-29 16:13:29 +0000
@@ -26,6 +26,7 @@
 # "interesting")
 workitem_precedence = [None, u'done', u'postponed', u'blocked', u'todo', u'inprogress']
 
+
 class PersonCache(object):
     """A cache of Launchpad accounts."""
 
@@ -91,7 +92,7 @@
         project_name = self.lp.load(milestone.target.self_link).name
         existing_milestone = self.store.find(
             models.Milestone,
-            models.Milestone.name==milestone_name).any()
+            models.Milestone.name == milestone_name).any()
         if existing_milestone is not None:
             # TODO: We now allow for the same milestone in different projects
             # to have different due dates (within reasonable limits).
@@ -107,19 +108,13 @@
             if isinstance(existing_target_date, datetime.date):
                 existing_target_date = existing_target_date.strftime("%Y-%m")
             if (target_date and existing_target_date != target_date):
-                error = MilestoneError(
-                    milestone,
-                    "Milestone %s in project %s has due_date %s, but project %s "
-                    "already had the due date as %s" % (milestone.name, project_name,
-                        target_date, existing_milestone.project,
-                        existing_target_date))
-#                self.error_collector.store_error(error)
-            return
-        db_milestone = models.Milestone()
-        db_milestone.name = milestone_name
-        db_milestone.due_date = milestone.date_targeted
-        db_milestone.project = project_name
-        self.store.add(db_milestone)
+                existing_milestone.due_date = milestone.date_targeted
+        else:
+            db_milestone = models.Milestone()
+            db_milestone.name = milestone_name
+            db_milestone.due_date = milestone.date_targeted
+            db_milestone.project = project_name
+            self.store.add(db_milestone)
 
     def store_lp_milestones(self, milestones):
         if self.store.find(models.Milestone).any() is not None:
@@ -274,7 +269,7 @@
             if ']' in desc:
                 off = desc.index(']')
                 assignee_name = desc[1:off]
-                desc = desc[off+1:].strip()
+                desc = desc[off + 1:].strip()
             else:
                 self.error_collector.record_blueprint_error(
                     self.blueprint,
@@ -318,6 +313,7 @@
     def get_workitem_if_tracked(self, task, projects=None,
                                 distro_release=None):
         target = self.lp.load(task.target.self_link)
+
         def get_rtype(obj):
             return urllib.splittag(obj.resource_type_link)[1]
         rtype = get_rtype(target)