Merge lp:~leonardr/ubuntu-qa-tools/fix-api-usage into lp:ubuntu-qa-tools

[Leonard Richardson]

Hi,

This branch removes the assumption in several scripts that the user is using the 'beta' version of the Launchpad web service. This will make it possible to use the scripts against the new '1.0' version. In several places it incorporates a workaround for bug 524775.

Leonard

[Ara Pulido (ara)]

Running one of your modified scripts I got the following error:

./bugs-since-sometime.py 3
Traceback (most recent call last):
  File "./bugs-since-sometime.py", line 57, in <module>
    primary = launchpad.load(launchpad._root_uri + 'ubuntu/+archive/primary')
TypeError: unsupported operand type(s) for +: 'URI' and 'str'

review: Needs Information

[lp:~leonardr/ubuntu-qa-tools/fix-api-usage]

322. By Leonard Richardson on 2010-03-31

Use str(root_uri) instead of root_uri itself.

[Leonard Richardson (leonardr)]

Good catch. I've fixed all instances of the problem and tested bugs-since-sometime myself.

=== modified file 'bug-report-framework/bugs-since-sometime.py'
--- bug-report-framework/bugs-since-sometime.py	2010-02-25 21:06:52 +0000
+++ bug-report-framework/bugs-since-sometime.py	2010-03-31 18:50:42 +0000
@@ -54,7 +54,7 @@
 
 bugcontrol = launchpad.people['ubuntu-bugcontrol']
 
-primary = launchpad.load('https://api.edge.launchpad.net/beta/ubuntu/+archive/primary')
+primary = launchpad.load(str(launchpad._root_uri) + 'ubuntu/+archive/primary')
 
 importances = { 'Critical':1, 'High':2, 'Medium':3, 'Low':4, 'Wishlist':5, 'Undecided':6 }
 

=== modified file 'bugs-mailinglist/ml-fixes-report'
--- bugs-mailinglist/ml-fixes-report	2010-03-31 16:37:16 +0000
+++ bugs-mailinglist/ml-fixes-report	2010-03-31 18:50:42 +0000
@@ -70,7 +70,7 @@
                                 if bug_number in bug_numbers:
                                     continue
                                 try:
-                                    task = launchpad.load('https://api.edge.launchpad.net/beta/ubuntu/+source/%s/+bug/%s' % ( sourcepackage, bug_number ))
+                                    task = launchpad.load(str(launchpad._root_uri) + 'ubuntu/+source/%s/+bug/%s' % ( sourcepackage, bug_number ))
                                     bug = launchpad.bugs[bug_number]
                                 except HTTPError, error:
                                     print "There was an error with LP: #%s: %s" % (bug_number, error)
@@ -119,7 +119,7 @@
                                     print "There was an error with bug LP: #%s: %s" % (bug_number, error.content)
                                 bug_numbers.append(bug_number)
                         
-                            #task = launchpad.load('https://api.edge.launchpad.net/beta/ubuntu/+source/%s/+bug/%s' % ( sourcepackage, bug ))
+                            #task = launchpad.load(str(launchpad._root_uri) + 'ubuntu/+source/%s/+bug/%s' % ( sourcepackage, bug ))
                             #print "LP: #%s %s task was fixed by %s in %s" % ( bug, sourcepackage, fixer, distribution )
                             #if task.date_created is None and task.date_fix_released is None:
                                 #print "\tProbable incorrect bug number in changelog!"

=== modified file 'bugs-mailinglist/ml-team-fixes-report'
--- bugs-mailinglist/ml-team-fixes-report	2010-03-31 16:37:16 +0000
+++ bugs-mailinglist/ml-team-fixes-report	2010-03-31 18:50:42 +0000
@@ -76,7 +76,7 @@
                                 if fixer not in team_members:
                                     continue
                                 try:
-                                    task = launchpad.load('https://api.edge.launchpad.net/beta/ubuntu/+source/%s/+bug/%s' % ( sourcepackage, bug_number ))
+                                    task = launchpad.load(str(launchpad._root_uri) + 'ubuntu/+source/%s/+bug/%s' % ( sourcepackage, bug_number ))
                                     bug = launchpad.bugs[bug_number]
                                 except HTTPError, error:
                                     print "There was an error with LP: #%s: %s" % (bug_number, error)
@@ -126,7 +126,7 @@
                                     print "There was an error with bug LP: #%s: %s" % (bug_number, error)
                                 bug_numbers.append(bug_number)
 
-                            #task = launchpad.load('https://api.edge.launchpad.net/beta/ubuntu/+source/%s/+bug/%s' % ( sourcepackage, bug ))
+                            #task = launchpad.load(str(launchpad._root_uri) + 'ubuntu/+source/%s/+bug/%s' % ( sourcepackage, bug ))
                             #print "LP: #%s %s task was fixed by %s in %s" % ( bug, sourcepackage, fixer, distribution )
                             #if task.date_created is None and task.date_fix_released is None:
                                 #print "\tProbable incorrect bug number in changelog!"

=== modified file 'launchpadlib-scripts/bugsquad-membership.py'
--- launchpadlib-scripts/bugsquad-membership.py	2010-03-01 17:38:42 +0000
+++ launchpadlib-scripts/bugsquad-membership.py	2010-03-31 18:50:42 +0000
@@ -45,7 +45,7 @@
 expiration_date = future.strftime("%Y-%m-%d")
 
 if person.is_ubuntu_coc_signer:
-    member_detail = launchpad.load('https://api.edge.launchpad.net/beta/~bugsquad/+member/%s' % lpid)
+    member_detail = launchpad.load(str(launchpad._root_uri) + '~bugsquad/+member/%s' % lpid)
     if member_detail.status == 'Proposed':
         # approving a member will use the default expiration date set for the team which is good
         try:

=== modified file 'launchpadlib-scripts/packages-without-subscribers.py'
--- launchpadlib-scripts/packages-without-subscribers.py	2010-01-05 03:28:06 +0000
+++ launchpadlib-scripts/packages-without-subscribers.py	2010-03-31 18:50:42 +0000
@@ -8,7 +8,8 @@
 # Find packages that do not have any subscribers
 # and may be neglected
 
-from launchpadlib.launchpad import Launchpad, EDGE_SERVICE_ROOT, STAGING_SERVICE_ROOT
+from launchpadlib.launchpad import Launchpad
+from launchpadlib.uris import LPNET_SERVICE_ROOT
 from launchpadlib.errors import HTTPError
 from launchpadlib.credentials import Credentials
 
@@ -23,7 +24,7 @@
 
 credfile = os.path.expanduser('~/.launchpadlib/%s.cred' % script_name)
 
-root = 'https://api.launchpad.net/beta/'
+root = LPNET_SERVICE_ROOT
 
 try:
     credentials = Credentials()

=== modified file 'responses/security/unlinkcves'
--- responses/security/unlinkcves	2009-03-30 18:14:45 +0000
+++ responses/security/unlinkcves	2010-03-31 18:50:42 +0000
@@ -14,6 +14,6 @@
 for b in ['157919','209901','246067']:
     bug = lp.bugs[b]
     for c in ['2008-1514','2008-3528','2008-3831','2009-0029','2008-4395']:
-        cve = lp.load('https://api.edge.launchpad.net/beta/bugs/cve/%s' % (c))
+        cve = lp.load(str(lp._root_uri) + '/bugs/cve/%s' % (c))
         print '%s %s' % (b, c)
         bug.unlinkCVE(cve=cve)