Merge lp:~fboucault/laika/improved_lp_username_detection into lp:laika

[Florian Boucault]

=== modified file 'laika.py'
--- laika.py	2010-07-17 15:17:34 +0000
+++ laika.py	2010-08-17 19:02:38 +0000
@@ -13,7 +13,8 @@
 
 import datetime
 from optparse import OptionParser
-import os
+import ConfigParser
+import os, os.path
 import re
 import sys
 
@@ -37,7 +38,7 @@
     bugs = {}
 
     def __init__(self, user, window):
-        cachedir = "/home/" + user + "/.launchpadlib/cache/"
+        cachedir = os.path.expanduser("~/.launchpadlib/cache")
         self.launchpad = Launchpad.login_with('laika', 'production', cachedir)
 
         self.user = self.launchpad.people[user]
@@ -136,17 +137,25 @@
         self.print_comments()
         self.print_reported()
 
+def get_launchpad_username_from_bazaar():
+    bazaar_config = ConfigParser.ConfigParser()
+    bazaar_config.read(os.path.expanduser("~/.bazaar/bazaar.conf"))
+    return bazaar_config.get("DEFAULT", "launchpad_username")
 
 def main():
+    try:
+        default_user = get_launchpad_username_from_bazaar()
+    except ConfigParser.NoOptionError:
+        default_user = os.getenv("USER")
 
     parser = OptionParser()
     parser.add_option('-u', '--user', dest='user',
-        default=os.getenv('USER'),
+        default=default_user,
         help='Specify the Launchpad user id.  '
-             'Defaults to authenticated token owner.')
+             'Defaults to launchpad username from Bazaar or session username.')
     parser.add_option('-w', '--window', dest='window', type='int',
         default=8,
-        help='Number af days of past activity to look for.  '
+        help='Number of days of past activity to look for.  '
              'Defaults to 8 days')
 
     options, arguments = parser.parse_args()