* AUTHORS: Updated list.

* debian/copyright: Synchronized with above.
* hugdaylist:
  - Added short version of GPL to header.
  - Rewrote option handling with optparse.
  - Filter bugs subscribed to the ubuntu-archive team.

AUTHORS

@@ -2,13 +2,15 @@ Albert Damen <albrt@gmx.net>
 Albin Tonnerre <lut1n.tne@gmail.com>
 Daniel Hahler <ubuntu@thequod.de>
 Daniel Holbach <daniel.holbach@ubuntu.com>
+Iain Lane <iain@orangesquash.org.uk>
 Jamin W. Collins <jcollins@asgardsrealm.net>
+Jonathan Patrick Davies <jpds@ubuntu.com>
 Jordan Mantha <mantha@ubuntu.com>
+Kees Cook <kees@ubuntu.com>
 Luke Yelavich <themuso@ubuntu.com>
 Martin Pitt <martin.pitt@ubuntu.com>
 Michael Bienia <geser@ubuntu.com>
 Pete Savage <petesavage@ubuntu.com>
-Kees Cook <kees@ubuntu.com>
 Siegfried-A. Gevatter <rainct@ubuntu.com>
 Soren Hansen <soren@ubuntu.com>
 Steve Kowalik <stevenk@ubuntu.com>

debian/changelog

@@ -7,7 +7,11 @@ ubuntu-dev-tools (0.36ubuntu1) intrepid; urgency=low
     - grab-attachment.1.
   * doc/requestsync.1: Described variables used by requestsync in man
     page. (LP: #237595)
-  * hugdaylist: Added code to handle exceptions.
+  * hugdaylist:
+    - Added code to handle exceptions and short version of GPL.
+    - Rewrote option handling with optparse.
+    - Filter bugs subscribed to the ubuntu-archive team.
+  * debian/copyright: Updated Authors and copyrights.
 
   [ Siegfried-Angel Gevatter Pujals ]
   * Change the versioning scheme from 0.XX to 0.XXubuntu1. Delete

debian/copyright

@@ -7,18 +7,19 @@ Upstream Authors:
 	Albin Tonnerre <lut1n.tne@gmail.com>
 	Daniel Hahler <ubuntu@thequod.de>
 	Daniel Holbach <daniel.holbach@ubuntu.com>
+	Iain Lane <iain@orangesquash.org.uk>
 	Jamin W. Collins <jcollins@asgardsrealm.net>
+	Jonathan Patrick Davies <jpds@ubuntu.com>
 	Jordan Mantha <mantha@ubuntu.com>
+	Kees Cook <kees@ubuntu.com>
 	Luke Yelavich <themuso@ubuntu.com>
 	Martin Pitt <martin.pitt@ubuntu.com>
 	Michael Bienia <geser@ubuntu.com>
 	Pete Savage <petesavage@ubuntu.com>
-	Kees Cook <kees@ubuntu.com>
 	Siegfried-A. Gevatter <rainct@ubuntu.com>
 	Soren Hansen <soren@ubuntu.com>
 	Steve Kowalik <stevenk@ubuntu.com>
 	Terence Simpson <stdin@stdin.me.uk>
-	Iain Lane <iain@orangesquash.org.uk>
 
 Copyright:
 
@@ -34,6 +35,7 @@ Copyright:
 	(C) 2007-2008, Siegfried-A. Gevatter <rainct@ubuntu.com>
 	(C) 2007, Terence Simpson <stdin@stdin.me.uk>
 	(C) 2008, Iain Lane <iain@orangesquash.org.uk>
+	(C) 2008, Jonathan Patrick Davies <jpds@ubuntu.com>
 
 Licenses:
 

hugdaylist

@@ -2,20 +2,37 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2007, Canonical, Daniel Holbach
+# Copyright (C) 2008 Jonathan Patrick Davies <jpds@ubuntu.com>
 #
-# GPL 3
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License.
+#
+#  This program 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 General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+#
+# hugdaylist - produces MoinMoin wiki formatted tables based on a Launchpad bug
+#              list.
 #
 # hugdaylist <url>
 # - produces lists like https://wiki.ubuntu.com/UbuntuBugDay/20070912?action=raw
 #
 # hugdaylist -n <howmany> <url>
-# - will only list <howmany> URLs
+# - will only list <howmany> URLs.
 #
 
-import re
 import os
-import sys
+import re
 import string
+import sys
+from optparse import OptionParser
 
 try:
     import launchpadbugs.connector as Connector
@@ -23,41 +40,55 @@ try:
     Bug = Connector.ConnectBug(method="Text")
 except ImportError:
     print >> sys.stderr, \
-	"You need python-launchpad-bugs (>= 0.2.25) installed to use hugdaylist."
+	"python-launchpad-bugs (>= 0.2.25) needs to be installed to use hugdaylist."
     sys.exit(1)
 
-
-USAGE = "hugdaylist [-n <howmany>] <URL>"
-
 def check_args():
     howmany = -1
     url = ""
+
+    # Our usage options.
+    usage = "usage: %prog [-n <number>] launchpad-buglist-url"
+    optParser = OptionParser(usage)
+
+    # Options - namely just the number of bugs to output.
+    optParser.add_option("-n", "--number", action = "store_true",
+            dest = "number", help = "Number of entries to output.")
+
+    # Parse arguments.
+    (options, args) = optParser.parse_args()
     
-    if len(sys.argv) < 2:
+    # Check if we want a number other than the default.
-        print >> sys.stderr, USAGE
+    if options.number:
-        sys.exit(1)
-    
-    if sys.argv[1] == "-n":
         try:
-            howmany = int(sys.argv[2])
+            howmany = int(args[0])
-        except IndexError:
+        except:
-            print "Option '-n' requires a number."
+            print >> sys.stderr, "Option '-n' requires an integer for an " \
-        if len(sys.argv) < 4:
+                "argument."
-        	print USAGE
+            optParser.print_help()
-        	sys.exit(1)
+            sys.exit(1)
-        url = sys.argv[3]
+
+    # Check that we have an URL.
+    if not args:
+        print >> sys.stderr, "An URL pointing to a Launchpad bug list is " \
+           "required."
+        optParser.print_help()
+        sys.exit(1)
     else:
-        url = sys.argv[1]
+        url = args[0]
-    
+
     return (howmany, url)
 
 def filter_unsolved(b):
     bug = Bug(int(b))
+    # Filter out special types of bugs:
+    # - https://wiki.ubuntu.com/Bugs/HowToTriage#Special%20types%20of%20bugs
     return filter(lambda a: a.status != 'Fix Committed' and \
 			 (a.assignee in ['motu','desktop-bugs'] or \
 			  not a.assignee), bug.infotable) and \
 	'ubuntu-main-sponsors' not in [str(s) for s in bug.subscribers] and \
-	'ubuntu-universe-sponsors' not in [str(s) for s in bug.subscribers]
+	'ubuntu-universe-sponsors' not in [str(s) for s in bug.subscribers] and \
+	'ubuntu-archive' not in [str(s) for s in bug.subscribers]
 
 def main(): 
     (howmany, url) = check_args()
@@ -88,5 +119,5 @@ if __name__ == '__main__':
     try:
 	    main()
     except KeyboardInterrupt:
-        print >> sys.stderr, "Aborted"
+        print >> sys.stderr, "Aborted."
         sys.exit(1)