Merge ~cjwatson/launchpadlib:tidy-contrib into launchpadlib:main

[Colin Watson]

Remove some obsolete scripts from contrib/

`editmoin` is a separate project that has nothing to do with launchpadlib.

`close_bugs_from_commits` and `update-milestone-progress` assumed that Launchpad's source is managed in bzr, which hasn't been true since 2019, and are no longer useful enough to justify maintaining them.

[Jürgen Gmach (jugmac00)]

LGTM

review: Approve

diff --git a/NEWS.rst b/NEWS.rst
index f9be974..4f3f24f 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -5,6 +5,7 @@ NEWS for launchpadlib
 1.10.16
 =======
 - Add ``pre-commit`` configuration.
+- Remove some obsolete scripts from ``contrib/``.
 
 1.10.15.1 (2021-10-27)
 ======================
diff --git a/contrib/close_bugs_from_commits.conf.sample b/contrib/close_bugs_from_commits.conf.sample
deleted file mode 100644
index 2fca4ae..0000000
--- a/contrib/close_bugs_from_commits.conf.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-[Project]
-# A comma separated list of Launchpad project names to close bugs for.
-# Only bugs targeted to these projects are closed.
-name = malone,launchpad
-
-[Branch States]
-# Which revnos were last looked through for each branch? The next time
-# the script run, it will start looking at revno+1.
-db = 7753
-devel = 7845
-
-[Branch Locations]
-# Which branches should be looked through for bug fixes? The left-hand
-# column is the branch name, and will be used in the comment saying that a
-# bug was fixed (e.g. "Fixed in db r7000.").
-db = bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/db-devel
-devel = bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel
-
diff --git a/contrib/close_bugs_from_commits.py b/contrib/close_bugs_from_commits.py
deleted file mode 100755
index cd92d95..0000000
--- a/contrib/close_bugs_from_commits.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2009 Canonical Ltd.
-#
-# This file is part of launchpadlib.
-#
-# launchpadlib is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by the
-# Free Software Foundation, version 3 of the License.
-#
-# launchpadlib is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import with_statement
-
-import re
-import os
-import sys
-from ConfigParser import RawConfigParser
-
-from bzrlib.branch import Branch
-
-from launchpadlib.launchpad import Launchpad
-
-fixed_bug_freeform_re = re.compile(
-    r'\(fixes bugs{0,1} (\d+(?:,\s*\d+)*)\)', re.IGNORECASE)
-fixed_bug_structured_re = re.compile(
-    r'\[bugs{0,1}[= ](\d+(?:,\s*\d+)*)\]', re.IGNORECASE)
-
-
-def get_fixed_bug_ids(revision):
-    """Try to extract which bugs were fixed by this revision."""
-    fixed_bugs = set()
-    commit_message = ' '.join(revision.message.split())
-    match = fixed_bug_freeform_re.search(commit_message)
-    if match is None:
-        match = fixed_bug_structured_re.search(commit_message)
-    if match is not None:
-        fixed_bugs.update(int(bug_id) for bug_id in match.group(1).split(','))
-    # TODO: Search revision properties.
-    return fixed_bugs
-
-
-def get_config(config_filepath):
-    config_parser = RawConfigParser()
-    config_parser.read([config_filepath])
-    branches = dict(
-        (name, dict(location=location))
-        for name, location in config_parser.items('Branch Locations'))
-    for name in branches:
-        branches[name]['last_revno'] = config_parser.getint(
-            'Branch States', name)
-    projects = config_parser.get('Project', 'name').split(',')
-    return branches, projects
-
-
-def set_last_revno(config_filepath, branch_name, revno):
-    config_parser = RawConfigParser()
-    config_parser.read([config_filepath])
-    config_parser.set('Branch States', branch_name, revno)
-    with open(config_filepath, 'w') as config_file:
-        config_parser.write(config_file)
-
-
-def main():
-    launchpad = Launchpad.login_with(os.path.basename(sys.argv[0]),
-                                     'production')
-
-    branches, project_names = get_config('close_bugs_from_commits.conf')
-
-    projects_links = []
-    for project_name in project_names:
-        projects_links.append(launchpad.projects[project_name].self_link)
-    for branch_name, branch_info in branches.items():
-        branch = Branch.open(branch_info['location'])
-        repository = branch.repository
-        start_revno = branch_info['last_revno'] + 1
-        for revno in range(start_revno, branch.revno()+1):
-            rev_id = branch.get_rev_id(revno)
-            revision = repository.get_revision(rev_id)
-            fixed_bugs = get_fixed_bug_ids(revision)
-            for fixed_bug in sorted(fixed_bugs):
-                try:
-                    lp_bug = launchpad.bugs[int(fixed_bug)]
-                except KeyError:
-                    # Invalid bug id specified, skip it.
-                    continue
-                for bug_task in lp_bug.bug_tasks:
-                    if bug_task.target.self_link in projects_links:
-                        break
-                else:
-                    # The bug wasn't targeted to our project.
-                    continue
-                fixed_statuses = [u'Fix Committed', u'Fix Released']
-                if bug_task.status not in fixed_statuses:
-                    print "Marking bug %s as fixed in r%s." % (
-                        lp_bug.id, revno)
-                    branch_location = branch_info['location'].replace(
-                        'bzr+ssh', 'http')
-                    codebrowse_url = (
-                        branch_location + '/revision/' + str(revno))
-                    bug_task.transitionToStatus(status=u'Fix Committed')
-                    bug_task.bug.newMessage(
-                        subject=u'Bug fixed by a commit',
-                        content=u'Fixed in %s r%s <%s>' % (
-                        branch_name, revno, codebrowse_url))
-            set_last_revno(
-                'close_bugs_from_commits.conf', branch_name, revno)
-    return 0
-
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/contrib/editmoin.py b/contrib/editmoin.py
deleted file mode 100755
index 01b48e4..0000000
--- a/contrib/editmoin.py
+++ /dev/null
@@ -1,423 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Copyright (c) 2002-2006  Gustavo Niemeyer <[e-mail]>
-
-This program allows you to edit moin (see http://moin.sourceforge.net)
-pages with your preferred editor. The default editor is vi. If you want
-to use any other, just set the EDITOR environment variable.
-
-To define your moin id used when logging in in a specifc moin, edit a
-file named ~/.moin_ids and include lines like "http://moin.url/etc myid".
-
-WARNING: This program expects information to be in a very specific
-         format. It will break if this format changes, so there are
-         no warranties of working at all. All I can say is that it
-         worked for me, at least once. ;-)
-
-Tested moin versions: 0.9, 0.11, 1.0, 1.1, 1.3.5, 1.5, 1.5.1, 1.5.4, 1.5.5,
-                      1.6, 1.6.1
-"""
-
-__author__ = "Gustavo Niemeyer <[e-mail]>"
-__version__ = "1.10.1"
-__license__ = "GPL"
-
-import tempfile
-import textwrap
-import sys, os
-import urllib
-import shutil
-import md5
-import re
-import subprocess
-
-
-USAGE = "Usage: editmoin [-t <template page>] <moin page URL>\n"
-
-IDFILENAME = os.path.expanduser("~/.moin_ids")
-ALIASFILENAME = os.path.expanduser("~/.moin_aliases")
-
-
-BODYRE = re.compile('<textarea.*?name="savetext".*?>(.*)</textarea>',
-                    re.M|re.DOTALL)
-DATESTAMPRE = re.compile('<input.*?name="datestamp".*?value="(.*?)".*?>')
-NOTIFYRE = re.compile('<input.*?name="notify".*?value="(.*?)".*?>')
-COMMENTRE = re.compile('<input.*?name="comment".*>')
-TRIVIALRE = re.compile('<input.*?name="trivial".*?value="(.*?)".*?>')
-MESSAGERE1 = re.compile('^</table>(.*?)<a.*?>Clear message</a>',
-                        re.M|re.DOTALL)
-MESSAGERE2 = re.compile('<div class="message">(.*?)</div>', re.M|re.DOTALL)
-MESSAGERE3 = re.compile('<div id="message">\s*<p>(.*?)</p>', re.M|re.DOTALL)
-STATUSRE = re.compile('<p class="status">(.*?)</p>', re.M|re.DOTALL)
-CANCELRE = re.compile('<input.*?type="submit" name="button_cancel" value="(.*?)">')
-EDITORRE = re.compile('<input.*?type="hidden" name="editor" value="text">')
-TICKETRE = re.compile('<input.*?type="hidden" name="ticket" value="(.*?)">')
-REVRE = re.compile('<input.*?type="hidden" name="rev" value="(.*?)">')
-CATEGORYRE = re.compile('<option value="(Category\w+?)">')
-SELECTIONRE = re.compile("\(([^)]*)\)\s*([^(]*)")
-EXTENDMSG = "Use the Preview button to extend the locking period."
-
-
-marker = object()
-
-
-class Error(Exception): pass
-
-
-class MoinFile:
-
-    multi_selection = ["notify", "trivial", "add_category"]
-
-    def __init__(self, filename, id, has_moin_session):
-        self.filename = filename
-        self.id = id
-        self.has_moin_session = has_moin_session
-        self.data = open(filename).read()
-        self.body = self._get_data(BODYRE, "body")
-
-        try:
-            self.datestamp = self._get_data(DATESTAMPRE, "datestamp")
-        except Error:
-            self.datestamp = None
-
-        try:
-            self.notify = self._get_data(NOTIFYRE, "notify")
-            self.comment = "None"
-        except Error:
-            self.notify = None
-            if COMMENTRE.search(self.data):
-                self.comment = "None"
-            else:
-                self.comment = None
-
-        try:
-            self.trivial = self._get_data(TRIVIALRE, "trivial")
-        except Error:
-            self.trivial = None
-
-        self.categories = self._get_data_findall(CATEGORYRE, "category", [])
-        self.add_category = None
-
-        match = STATUSRE.search(self.data)
-        if match:
-            self.status = strip_html(match.group(1))
-        else:
-            self.status = None
-
-        self.rev = self._get_data(REVRE, "rev", None)
-        self.ticket = self._get_data(TICKETRE, "ticket", None)
-
-    def _get_data(self, pattern, info, default=marker):
-        match = pattern.search(self.data)
-        if not match:
-            if default is not marker:
-                return default
-            message = get_message(self.data)
-            if message:
-                print message
-            raise Error, info+" information not found"
-        else:
-            return match.group(1)
-
-    def _get_data_findall(self, pattern, info, default=marker):
-        groups = pattern.findall(self.data)
-        if not groups:
-            if default is not marker:
-                return default
-            raise Error, info+" information not found"
-        return groups
-
-    def _get_selection(self, str):
-        for selected, option in SELECTIONRE.findall(str):
-            if selected.strip():
-                return option.strip()
-        return None
-
-    def _unescape(self, data):
-        data = data.replace("&lt;", "<")
-        data = data.replace("&gt;", ">")
-        data = data.replace("&amp;", "&")
-        return data
-
-    def has_cancel(self):
-        return (CANCELRE.search(self.data) is not None)
-
-    def has_editor(self):
-        return (EDITORRE.search(self.data) is not None)
-
-    def write_raw(self):
-        filename = tempfile.mktemp(".moin")
-        file = open(filename, "w")
-        if self.has_moin_session:
-            syntax_version = "1.6"
-        else:
-            syntax_version = "1.5"
-        file.write("@@ Syntax: %s\n" % syntax_version)
-        if not self.id:
-            file.write("@@ WARNING! You're NOT logged in!\n")
-        if self.status is not None:
-            text = self.status.replace(EXTENDMSG, "").strip()
-            lines = textwrap.wrap(text, 70,
-                                  initial_indent="@@ Message: ",
-                                  subsequent_indent="@           ")
-            for line in lines:
-                file.write(line+"\n")
-        if self.comment is not None:
-            file.write("@@ Comment: %s\n" % self.comment)
-        if self.trivial is not None:
-            file.write("@@ Trivial: ( ) Yes  (x) No\n")
-        if self.notify is not None:
-            yes, no = (self.notify and ("x", " ") or (" ", "x"))
-            file.write("@@ Notify: (%s) Yes  (%s) No\n" % (yes, no))
-        if self.categories:
-            file.write("@@ Add category: (x) None\n")
-            for category in self.categories:
-                file.write("@                ( ) %s\n" % category)
-        file.write(self._unescape(self.body))
-        file.close()
-        return filename
-
-    def read_raw(self, filename):
-        file = open(filename)
-        lines = []
-        data = file.readline()
-        while data != "\n":
-            if data[0] != "@":
-                break
-            if len(data) < 2:
-                pass
-            elif data[1] == "@":
-                lines.append(data[2:].strip())
-            else:
-                if not lines:
-                    lines.append("")
-                lines[-1] += " "
-                lines[-1] += data[2:].strip()
-            data = file.readline()
-        self.body = data+file.read()
-        file.close()
-        for line in lines:
-            sep = line.find(":")
-            if sep != -1:
-                attr = line[:sep].lower().replace(' ', '_')
-                value = line[sep+1:].strip()
-                if attr in self.multi_selection:
-                    setattr(self, attr, self._get_selection(value))
-                else:
-                    setattr(self, attr, value)
-
-def get_message(data):
-    match = MESSAGERE3.search(data)
-    if not match:
-        # Check for moin < 1.3.5 (not sure the precise version it changed).
-        match = MESSAGERE2.search(data)
-    if not match:
-        # Check for moin <= 0.9.
-        match = MESSAGERE1.search(data)
-    if match:
-        return strip_html(match.group(1))
-    return None
-
-def strip_html(data):
-    data = re.subn("\n", " ", data)[0]
-    data = re.subn("<p>|<br>", "\n", data)[0]
-    data = re.subn("<.*?>", "", data)[0]
-    data = re.subn("Clear data", "", data)[0]
-    data = re.subn("[ \t]+", " ", data)[0]
-    data = data.strip()
-    return data
-
-def get_id(moinurl):
-    if os.path.isfile(IDFILENAME):
-        file = open(IDFILENAME)
-        for line in file.readlines():
-            line = line.strip()
-            if line and line[0] != "#":
-                tokens = line.split()
-                if len(tokens) > 1:
-                    url, id = tokens[:2]
-                else:
-                    url, id = tokens[0], None
-                if moinurl.startswith(url):
-                    return id
-    return None
-
-def translate_shortcut(moinurl):
-    if "://" in moinurl:
-        return moinurl
-    if "/" in moinurl:
-        shortcut, pathinfo = moinurl.split("/", 1)
-    else:
-        shortcut, pathinfo = moinurl, ""
-    if os.path.isfile(ALIASFILENAME):
-        file = open(ALIASFILENAME)
-        try:
-            for line in file.readlines():
-                line = line.strip()
-                if line and line[0] != "#":
-                    alias, value = line.split(None, 1)
-                    if pathinfo:
-                        value = "%s/%s" % (value, pathinfo)
-                    if shortcut == alias:
-                        if "://" in value:
-                            return value
-                        if "/" in value:
-                            shortcut, pathinfo = value.split("/", 1)
-                        else:
-                            shortcut, pathinfo = value, ""
-        finally:
-            file.close()
-    if os.path.isfile(IDFILENAME):
-        file = open(IDFILENAME)
-        try:
-            for line in file.readlines():
-                line = line.strip()
-                if line and line[0] != "#":
-                    url = line.split()[0]
-                    if shortcut in url:
-                        if pathinfo:
-                            return "%s/%s" % (url, pathinfo)
-                        else:
-                            return url
-        finally:
-            file.close()
-    raise Error, "no suitable url found for shortcut '%s'" % shortcut
-
-
-def get_urlopener(moinurl, id=None):
-    urlopener = urllib.FancyURLopener()
-    proxy = os.environ.get("http_proxy")
-    if proxy:
-        urlopener.proxies.update({"http": proxy})
-    if id:
-        # moinmoin < 1.6
-        urlopener.addheader("Cookie", "MOIN_ID=\"%s\"" % id)
-        # moinmoin >= 1.6
-        urlopener.addheader("Cookie", "MOIN_SESSION=\"%s\"" % id)
-    return urlopener
-
-def fetchfile(urlopener, url, id, template):
-    geturl = url+"?action=edit"
-    if template:
-        geturl += "&template=" + urllib.quote(template)
-    filename, headers = urlopener.retrieve(geturl)
-    has_moin_session = "MOIN_SESSION" in headers.get("set-cookie", "")
-    return MoinFile(filename, id, has_moin_session)
-
-def editfile(moinfile):
-    edited = 0
-    filename = moinfile.write_raw()
-    editor = os.environ.get("EDITOR", "vi")
-    digest = md5.md5(open(filename).read()).digest()
-    subprocess.call([editor, filename])
-    if digest != md5.md5(open(filename).read()).digest():
-        shutil.copyfile(filename, os.path.expanduser("~/.moin_lastedit"))
-        edited = 1
-        moinfile.read_raw(filename)
-    os.unlink(filename)
-    return edited
-
-def sendfile(urlopener, url, moinfile):
-    if moinfile.comment is not None:
-        comment = "&comment="
-        if moinfile.comment.lower() != "none":
-            comment += urllib.quote(moinfile.comment)
-    else:
-        comment = ""
-    data = "button_save=1&savetext=%s%s" \
-           % (urllib.quote(moinfile.body), comment)
-    if moinfile.has_editor():
-        data += "&action=edit"      # Moin >= 1.5
-    else:
-        data += "&action=savepage"  # Moin < 1.5
-    if moinfile.datestamp:
-        data += "&datestamp=" + moinfile.datestamp
-    if moinfile.rev:
-        data += "&rev=" + moinfile.rev
-    if moinfile.ticket:
-        data += "&ticket=" + moinfile.ticket
-    if moinfile.notify == "Yes":
-        data += "&notify=1"
-    if moinfile.trivial == "Yes":
-        data += "&trivial=1"
-    if moinfile.add_category and moinfile.add_category != "None":
-        data += "&category=" + urllib.quote(moinfile.add_category)
-    url = urlopener.open(url, data)
-    answer = url.read()
-    url.close()
-    message = get_message(answer)
-    if message is None:
-        print answer
-        raise Error, "data submitted, but message information not found"
-    else:
-        print message
-
-def sendcancel(urlopener, url, moinfile):
-    if not moinfile.has_cancel():
-        return
-    data = "button_cancel=Cancel"
-    if moinfile.has_editor():
-        data += "&action=edit&savetext=dummy"  # Moin >= 1.5
-    else:
-        data += "&action=savepage"             # Moin < 1.5
-    if moinfile.datestamp:
-        data += "&datestamp=" + moinfile.datestamp
-    if moinfile.rev:
-        data += "&rev=" + moinfile.rev
-    if moinfile.ticket:
-        data += "&ticket=" + moinfile.ticket
-    url = urlopener.open(url, data)
-    answer = url.read()
-    url.close()
-    message = get_message(answer)
-    if not message:
-        print answer
-        raise Error, "cancel submitted, but message information not found"
-    else:
-        print message
-
-
-def editshortcut(shortcut, template=None, editfile_func=editfile):
-    """Edit a Moin page at a shortcut path.
-
-    By default the editfile() function is used to actually edit the
-    page, but a custom one can be passed in as the editfile_func
-    parameter.
-
-    Return True if the page as edited, otherwise False.
-    """
-    url = translate_shortcut(shortcut)
-    id = get_id(url)
-    urlopener = get_urlopener(url, id)
-    moinfile = fetchfile(urlopener, url, id, template)
-    try:
-        page_edited = editfile_func(moinfile)
-        if page_edited:
-            sendfile(urlopener, url, moinfile)
-        else:
-            sendcancel(urlopener, url, moinfile)
-    finally:
-        os.unlink(moinfile.filename)
-    return page_edited
-
-
-def main():
-    argv = sys.argv[1:]
-    template = None
-    if len(argv) > 2 and argv[0] == "-t":
-        template = argv[1]
-        argv = argv[2:]
-    if len(argv) != 1 or argv[0] in ("-h", "--help"):
-        sys.stderr.write(USAGE)
-        sys.exit(1)
-    try:
-        editshortcut(argv[0], template)
-    except (IOError, OSError, Error), e:
-        sys.stderr.write("error: %s\n" % str(e))
-        sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-
-# vim:et:ts=4:sw=4
diff --git a/contrib/test_close_bugs_from_commits.py b/contrib/test_close_bugs_from_commits.py
deleted file mode 100644
index 11daf2e..0000000
--- a/contrib/test_close_bugs_from_commits.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright (C) 2009 Canonical Ltd.
-#
-# This file is part of launchpadlib.
-#
-# launchpadlib is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by the
-# Free Software Foundation, version 3 of the License.
-#
-# launchpadlib is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
-
-"""Test for close_bugs_from_commits.get_fixed_bug_ids()."""
-
-import unittest
-
-from close_bugs_from_commits import get_fixed_bug_ids
-
-
-class FakeRevision:
-
-    def __init__(self, message):
-        self.message = message
-
-
-class TestGetFixedBugIds(unittest.TestCase):
-
-    def test_one_freeform(self):
-        # One bug specified in the format: (fixes bug 42)
-        self.assertEqual(
-            get_fixed_bug_ids(FakeRevision("before (fixes bug 42) after")),
-            set([42]))
-
-    def test_multiple_freeform(self):
-        # Multiple bugs specified in the format: (fixes bugs 42, 84, 168)
-        self.assertEqual(
-            get_fixed_bug_ids(
-                FakeRevision("before (fixes bug 42, 84, 168) after")),
-            set([42, 84, 168]))
-        self.assertEqual(
-            get_fixed_bug_ids(
-                FakeRevision("before (fixes bug 42,84,168) after")),
-            set([42, 84, 168]))
-
-    def test_freeform_case_insensitve(self):
-        # The freeform format isn't case sensitive.
-        self.assertEqual(
-            get_fixed_bug_ids(FakeRevision("before (FIXES BUG 42) after")),
-            set([42]))
-
-    def test_one_structured(self):
-        # One bug specified in the format: [bug=42]
-        self.assertEqual(
-            get_fixed_bug_ids(FakeRevision("before [bug=42]) after")),
-            set([42]))
-
-    def test_one_structured_no_equal_sign(self):
-        # One bug specified in the format: [bug 42]
-        self.assertEqual(
-            get_fixed_bug_ids(FakeRevision("before [bug 42]) after")),
-            set([42]))
-
-    def test_multiple_structured(self):
-        # Multiple bugs specified in the format: [bug=42, 84, 168]
-        self.assertEqual(
-            get_fixed_bug_ids(
-                FakeRevision("before [bug=42, 84, 168]) after")),
-            set([42, 84, 168]))
-
-    def test_multiple_structured_bugs(self):
-        # Multiple bugs specified in the format: [bugs=42, 84, 168]
-        self.assertEqual(
-            get_fixed_bug_ids(
-                FakeRevision("before [bugs=42, 84, 168]) after")),
-            set([42, 84, 168]))
-        self.assertEqual(
-            get_fixed_bug_ids(
-                FakeRevision("before [bugs=42,84,168]) after")),
-            set([42, 84, 168]))
-
-    def test_mention_bug(self):
-        # Bugs simply mentioned among the commit message shouldn't be
-        # considered being fixed.
-        self.assertEqual(
-            get_fixed_bug_ids(
-                FakeRevision("find bug 4231 after")),
-            set([]))
-
-    def test_mention_multiple_bugs(self):
-        # Bugs simply mentioned among the commit message shouldn't be
-        # considered being fixed.
-        self.assertEqual(
-            get_fixed_bug_ids(
-                FakeRevision("find bug 123456 after 2345 and also 1234, end.")),
-            set([]))
-
diff --git a/contrib/update-milestone-progress.conf.sample b/contrib/update-milestone-progress.conf.sample
deleted file mode 100644
index feaff5b..0000000
--- a/contrib/update-milestone-progress.conf.sample
+++ /dev/null
@@ -1,43 +0,0 @@
-[Branch]
-# The location of the branch that should be scanned for commits. It's
-# best to keep a mirror locally, and point to the local mirror. Going
-# through each commit on a remote branch might take quite a while.
-location=bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel
-# The revision number where we should start scanning for commits. This
-# should be the revision where release-critical is turned off.
-start_revno=7677
-
-[Milestone]
-# The name of the current milestone.
-name=2.2.2
-# The project where bugs should be search in.
-project=launchpad-project
-# The day the milestone starts.
-start=2009-02-02
-# The day the milestone ends.
-end=2009-02-25
-# The day PQM gets set to release-critical mode.
-release-critical=2009-02-20
-# The name of the template for the progress wiki page.
-template=update-milestone.template.sample
-# The base URL where the wiki page live. The page URL will be this URL
-# plus the milestone name appended to it. This should be an editmoin
-# shortcut URL.
-base_wiki_location=dev.launchpad.net/VersionThreeDotO/Project/Progress
-# The page where the story definitions are. The story titles on the
-# progress page will link to this URL, together with an anchor, which is
-# the story tag name with the 'story-' part removed.
-stories_page=https://dev.launchpad.net/VersionThreeDotO/Project/StoryCards
-
-[Stories]
-# The list of stories that are scheduled for this milestone.
-# story_tag_name=story_name_for_display
-story-hwdb-affected-users=HWDB Affected Users
-story-hwdb-dmi-lspci=Include DMI and lspci information in HWDB submissions
-story-hwdb-filter-by-device-and-system=Find out which computers have a certain device
-story-link-to-upstream-filebug=Link to file bugs upstream
-story-link-to-upstream-searchbugs=Link to search bugs upstream
-story-set-remote-product-manually=Enable search and filebug links for a project manually
-story-set-remote-product-automatically=Enable search and filebug links for a project automatically
-story-inline-edit-bug-summary-description=Inline editing of bug description and summary
-story-hwdb-users-using-driver=Get number of users using a driver
diff --git a/contrib/update-milestone-progress.py b/contrib/update-milestone-progress.py
deleted file mode 100755
index 1c207fc..0000000
--- a/contrib/update-milestone-progress.py
+++ /dev/null
@@ -1,359 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2009 Canonical Ltd.
-#
-# This file is part of launchpadlib.
-#
-# launchpadlib is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by the
-# Free Software Foundation, version 3 of the License.
-#
-# launchpadlib is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import with_statement
-from ConfigParser import RawConfigParser
-from datetime import date, timedelta
-import os
-import sys
-
-from bzrlib.branch import Branch
-
-from close_bugs_from_commits import get_fixed_bug_ids
-from editmoin import editshortcut
-from launchpadlib.launchpad import Launchpad
-
-
-class Config:
-    def __init__(self):
-        self.tag_to_story_name = {}
-        self.milestone_name = None
-        self.start = None
-        self.end = None
-        self.project_name = None
-        self.template_filename = None
-        self.branch_location = None
-        self.branch_start_revno = None
-        self.base_wiki_location = None
-        self.stories_page = None
-
-    @property
-    def story_tags(self):
-        return self.tag_to_story_name.keys()
-
-
-def get_assignee_name(bugtask):
-    """Get the name of the person assigned to the bug task.
-
-    Instead of accessing bugtask.assignee.name, the name is extracted
-    from the assignee_link, which avoids fetching the assignee object
-    from the web service.
-    """
-    if bugtask.assignee_link is None:
-        return None
-    url_parts = bugtask.assignee_link.split('/')
-    return url_parts[-1].lstrip('~')
-
-
-def string_isodate_to_date(string_isodate):
-    if 'T' in string_isodate:
-        string_isodate, rest = string_isodate.split('T', 1)
-    year, month, day = string_isodate.split('-')
-    return date(int(year), int(month), int(day))
-
-
-class MilestoneState:
-    """The current state of the milestone."""
-
-    def __init__(self, start, end, today):
-        self.days = {}
-        self.today = today
-        self.start = start
-        self.end = end
-        one_day = timedelta(days=1)
-        current_day = start
-        while current_day <= end:
-            self.days[current_day] = {}
-            current_day += one_day
-
-    def mark_done(self, bug_id, day):
-        if day < self.start:
-            day = self.start
-        if day > self.end:
-            # It was fixed after the milestone ended.
-            return
-        self.days[day][bug_id] = 'D'
-
-    def mark_started(self, bug_id, day):
-        if day not in self.days:
-            day = self.start
-        self.days[day][bug_id] = 'P'
-
-    def mark_added(self, bug_id, day):
-        self.days[day][bug_id] = 'N'
-
-
-def get_config(config_filepath):
-    """Create a map between committers and their test pages.
-
-    Read the config file, and return a map, mapping a committer to the
-    name of the wiki page where test plans are held.
-    """
-    config_parser = RawConfigParser()
-    config_parser.read([config_filepath])
-    config = Config()
-
-    config.branch_location = config_parser.get('Branch', 'location')
-    config.branch_start_revno = config_parser.getint('Branch', 'start_revno')
-
-    config.milestone_name = config_parser.get('Milestone', 'name')
-    config.project_name = config_parser.get('Milestone', 'project')
-    config.template_filename = config_parser.get('Milestone', 'template')
-    config.base_wiki_location = config_parser.get(
-        'Milestone', 'base_wiki_location')
-    config.stories_page = config_parser.get(
-        'Milestone', 'stories_page')
-    config.start = string_isodate_to_date(
-        config_parser.get('Milestone', 'start'))
-    config.end = string_isodate_to_date(
-        config_parser.get('Milestone', 'end'))
-    config.release_critical = string_isodate_to_date(
-        config_parser.get('Milestone', 'release_critical'))
-    config.story_tags = []
-    for tag_name, story_name in config_parser.items('Stories'):
-        config.story_tags.append(tag_name)
-        config.tag_to_story_name[unicode(tag_name)] = story_name
-    return config
-
-
-class Story:
-
-    def __init__(self, name, tag_name):
-        self.name = name
-        self.tag_name = tag_name
-        self.tasks = []
-
-
-ALL_BUG_STATUSES = [
-    "New",
-    "Incomplete",
-    "Invalid",
-    "Won't Fix",
-    "Confirmed",
-    "Triaged",
-    "In Progress",
-    "Fix Committed",
-    "Fix Released",
-    ]
-
-content_color = {
-    'P': '#FF8080',
-    'N': '#FFFFE0',
-    'D': '#80FF80',
-    }
-
-def get_cell_style(content, fallback_color=None):
-    color = content_color.get(content, fallback_color)
-    if color is not None:
-        return '<style="background-color: %s;">' % color
-    else:
-        return ''
-
-def generate_milestone_table(milestone_state, stories, config):
-    table_rows = []
-    row_items = [
-        "''Story/Task''",
-        "''Assignee''",
-        ]
-    for day in sorted(milestone_state.days.keys()):
-        row_items.append("''%s''" % str(day.day))
-    table_rows.append('|| %s ||' % ' || '.join(row_items))
-    for story in stories:
-        row_items = []
-        unimportant, story_anchor = story.tag_name.split('-', 1)
-        if story.tag_name == 'unrelated-bugs':
-            row_items.append(
-                '<rowstyle="background-color: #CC6633;">'
-                ' %s' % story.name)
-        else:
-            row_items.append(
-                '<rowstyle="background-color: #E0E0FF;">'
-                " '''[[%s#%s|%s]]'''" % (
-                    config.stories_page, story_anchor, story.name))
-
-        row_items.append('') # Assignee
-        task_state = ''
-        for day in sorted(milestone_state.days.keys()):
-            row_items.append(task_state)
-        table_rows.append('||%s ||' % ' ||'.join(row_items))
-        for bugtask in story.tasks:
-            row_items = []
-            row_items.append(
-                '[[https://launchpad.net/bugs/%(bug_id)s|#%(bug_id)s]]:'
-                ' %(title)s' % dict(
-                    bug_id=bugtask.bug.id, title=bugtask.bug.title))
-            assignee_name = get_assignee_name(bugtask)
-            if assignee_name is not None:
-                row_items.append(" [[/%s|%s]] "% (
-                    assignee_name, assignee_name))
-            else:
-                row_items.append('') # Assignee
-            task_state = ''
-            future_color = ''
-            for day, changes in sorted(milestone_state.days.items()):
-                task_state = changes.get(bugtask.bug.id, task_state)
-                if day > milestone_state.today:
-                    task_state = ''
-                    if day > config.release_critical:
-                        future_color = '#C8BBBE'
-                row_items.append("%s %s" % (
-                    get_cell_style(task_state, future_color), task_state))
-            table_rows.append('|| %s ||' % ' ||'.join(row_items))
-
-    return '\n'.join(table_rows)
-
-
-
-def get_day_added(task, fallback=None):
-    return fallback
-
-
-def get_day_started(task):
-    if task.date_in_progress is not None:
-        return string_isodate_to_date(task.date_in_progress)
-    return None
-
-
-def get_day_done(task):
-    # We should be able to use date_closed, but it seems like it's not
-    # always set.
-    closed_date_attributes = ['date_fix_committed', 'date_fix_released']
-    for closed_date_attribute in closed_date_attributes:
-        date_closed = getattr(task, closed_date_attribute)
-        if date_closed is not None:
-            return string_isodate_to_date(date_closed)
-    return None
-
-
-def get_associated_story_tags(bugtask):
-    return [tag for tag in bugtask.bug.tags if tag.startswith('story-')]
-
-
-def main():
-    config = get_config('update-milestone-progress.conf')
-    launchpad = Launchpad.login_with(os.path.basename(sys.argv[0]),
-                                     'production')
-    stories = dict(
-        (story_tag, Story(story_name, story_tag))
-        for story_tag, story_name in sorted(config.tag_to_story_name.items()))
-    # 'unrelated' isn't quite right, but I want to sort on the tag name
-    # and have the bugs come last.
-    stories['unrelated-bugs'] = Story(
-        'Bugs not related to a story', 'unrelated-bugs')
-    project = launchpad.projects[config.project_name]
-    for milestone in project.all_milestones:
-        if milestone.name == config.milestone_name:
-            break
-    else:
-        raise AssertionError("No milestone: %s" % config.milestone_name)
-
-    today = date.today()
-    milestone_state = MilestoneState(config.start, config.end, today)
-
-    milestone_bugtasks = dict(
-        (bugtask.bug.id, bugtask)
-        for bugtask in project.searchTasks(status=ALL_BUG_STATUSES,
-                                           milestone=milestone))
-    assignees = set()
-    for task in milestone_bugtasks.values():
-        assignee_name = get_assignee_name(task)
-        if assignee_name is not None:
-            assignees.add(assignee_name)
-        associated_story_tags = get_associated_story_tags(task)
-        if len(associated_story_tags) == 0:
-            # This bug isn't part of a story. Put it into the pseudo
-            # story which is used for all such bug fixes.
-            associated_story_tags = ['unrelated-bugs']
-        for story_tag in associated_story_tags:
-            if story_tag not in stories:
-                stories[story_tag] = Story(
-                    story_tag[len('story-'):], story_tag)
-            stories[story_tag].tasks.append(task)
-        milestone_state.mark_added(
-            task.bug.id, get_day_added(task, fallback=config.start))
-        day_started = get_day_started(task)
-        if day_started is not None:
-            milestone_state.mark_started(task.bug.id, day_started)
-        day_done = get_day_done(task)
-        if day_done is not None:
-            milestone_state.mark_done(task.bug.id, day_done)
-
-    # Look through commits and marks tasks as done, if any bug fixes are
-    # found.
-    branch = Branch.open(config.branch_location)
-    repository = branch.repository
-    start_revno = config.branch_start_revno
-    for revno in range(start_revno, branch.revno()+1):
-        rev_id = branch.get_rev_id(revno)
-        revision = repository.get_revision(rev_id)
-        fixed_bugs = get_fixed_bug_ids(revision)
-        for fixed_bug in sorted(fixed_bugs):
-            try:
-                lp_bug = launchpad.bugs[int(fixed_bug)]
-            except KeyError:
-                # Invalid bug id specified, skip it.
-                continue
-            if milestone_bugtasks.get(lp_bug.id) is not None:
-                milestone_state.mark_done(
-                    lp_bug.id, date.fromtimestamp(revision.timestamp))
-
-    # Order by the order in the config file first.
-    sorted_stories = [stories[story_tag] for story_tag in config.story_tags]
-    sorted_stories.extend(
-        story for story_tag, story in sorted(stories.items())
-        if story_tag not in config.story_tags)
-    table = generate_milestone_table(milestone_state, sorted_stories, config)
-    with open(config.template_filename, 'r') as template:
-        page = template.read() % dict(
-            milestone=config.milestone_name,
-            progress_table=table,
-            )
-    def update_if_modified(moinfile):
-        if moinfile._unescape(moinfile.body) == page:
-            # Nothing has changed, cancel the edit.
-            return 0
-        else:
-            moinfile.body = page
-            return 1
-
-    page_shortcut = config.base_wiki_location + config.milestone_name
-    editshortcut(page_shortcut, editfile_func=update_if_modified)
-
-    # Generate assignee pages.
-    for assignee_name in assignees:
-        print "Assignee: %s" % assignee_name
-        assignee_stories = dict()
-        for story in stories.values():
-            assigned_bugs = [
-                bug_task for bug_task in story.tasks
-                if (bug_task.assignee is not None and
-                    bug_task.assignee.name == assignee_name)]
-            if len(assigned_bugs) > 0:
-                assignee_stories[story.tag_name] = Story(
-                    story.name, story.tag_name)
-                assignee_stories[story.tag_name].tasks = assigned_bugs
-        page = generate_milestone_table(
-            milestone_state, assignee_stories.values(), config)
-        assignee_page_shortcut = page_shortcut + '/' + assignee_name
-        editshortcut(
-            assignee_page_shortcut, editfile_func=update_if_modified)
-
-    print "done."
-
-if __name__ == '__main__':
-    main()
diff --git a/contrib/update-milestone-progress.template.sample b/contrib/update-milestone-progress.template.sample
deleted file mode 100644
index 0db2ae0..0000000
--- a/contrib/update-milestone-progress.template.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-= %(milestone)s Feature Progress =
-
-All the features that are currently being worked on are listed here. Don't edit this page. This information is being generated by a script, and any manual edits will be overwritten the next time the script runs.
-
-'''This page is currently in a beta stage, and the information here might not be
-correct.'''
-
-%(progress_table)s