Merge ubuntu-qa-website:fix-sync-lp-bugs into ubuntu-qa-website:main

[Brian Murray]

The server which is the ISO tracker is now running on uses python3 so sync-lp-bugs need some python3 changes for that. Additionally, postgres is setup to use unix socket authentication so the config file needed changing and the server is listening on port 80 now but a content cache server is providing https.

[Tim Andersson (andersson123)]

I'm not massively familiar with this repo, but I can see the essence of these changes. My review may not mean much because of that, but regardless, LGTM!

review: Approve

[Paride Legovini (paride)]

We probably don't need most or all of those str() calls replacing unicode() calls. However they are also not harmful in any way. There is just one that is certainly useless (nit).

[Paride Legovini (paride)]

Up to you whether investigate if we actually need those str() calls or not.

review: Approve

66d442c... by Brian Murray on 2024-01-10

Remove an unnecessary str call

8ea4814... by Brian Murray on 2024-01-10

Remove all unnecessary str() calls

diff --git a/scripts/database.conf b/scripts/database.conf
index e3399e8..5e8ff24 100644
--- a/scripts/database.conf
+++ b/scripts/database.conf
@@ -1,5 +1,5 @@
 [database]
-host = localhost
-user = dbuser
-password = dbpassword
+host =
+user = qatracker
+password =
 database = qatracker
diff --git a/scripts/sync-lp-bugs b/scripts/sync-lp-bugs
index 3db9070..8e88410 100755
--- a/scripts/sync-lp-bugs
+++ b/scripts/sync-lp-bugs
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Written by Stephane Graber <[e-mail]>
 
 # This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@ import datetime
 import logging
 import os
 import sys
-import xmlrpclib
+import xmlrpc.client
 from optparse import OptionParser
 from configobj import ConfigObj
 from storm.locals import create_database, DateTime, Int, ReferenceSet, Store, \
@@ -101,7 +101,7 @@ from launchpadlib.credentials import Credentials
 # Initialize the cache
 cachedir = ".launchpadlib/cache"
 if not os.path.exists(cachedir):
-    os.makedirs(cachedir, 0700)
+    os.makedirs(cachedir, 0o700)
 
 # Get credential
 credfile = "sync-lp-bugs.cred"
@@ -113,7 +113,7 @@ try:
 except:
     launchpad = Launchpad.get_token_and_login("sync-lp-bugs",
                                                 LPNET_SERVICE_ROOT, cachedir)
-    launchpad.credentials.save(open(credfile, "w", 0600))
+    launchpad.credentials.save(open(credfile, "w", 0o600))
 
 # Load the configuration
 config = ConfigObj(args.config)
@@ -153,12 +153,12 @@ for site in config['sites']:
 
     site_comment = None
     site_tags = None
-    site_rpc = xmlrpclib.ServerProxy("https://%s/xmlrpc.php" %
+    site_rpc = xmlrpc.client.ServerProxy("http://%s/xmlrpc.php" %
                                             site_domain).qatracker
-    site_bugurl = "https://%s/qatracker/reports/bugs" % site_domain
+    site_bugurl = "http://%s/qatracker/reports/bugs" % site_domain
 
     # Start by looking for the site in the database
-    site_dbrecords = store.find(Site, subdomain=unicode(site_domain))
+    site_dbrecords = store.find(Site, subdomain=str(site_domain))
     if site_dbrecords.count() != 1:
         logging.error("Unable to find site: %s" % site_domain)
         continue
@@ -218,21 +218,21 @@ for site in config['sites']:
 
         if bug_task.assignee:
             try:
-                bug_assignee = unicode(bug_task.assignee.display_name)
+                bug_assignee = bug_task.assignee.display_name
             except:
                 try:
-                    bug_assignee = unicode(bug_task.assignee.name)
+                    bug_assignee = bug_task.assignee.name
                 except:
-                    bug_assignee = unicode("Unknown")
+                    bug_assignee = ("Unknown")
         else:
             bug_assignee = None
 
         bug_db.originalbug = bug_number
         bug_db.bugnumber = bug_lp.id
-        bug_db.title = unicode(bug_lp.title)
-        bug_db.product = unicode(bug_task.bug_target_display_name)
-        bug_db.status = unicode(bug_task.status)
-        bug_db.importance = unicode(bug_task.importance)
+        bug_db.title = bug_lp.title
+        bug_db.product = bug_task.bug_target_display_name
+        bug_db.status = bug_task.status
+        bug_db.importance = bug_task.importance
         bug_db.assignee = bug_assignee
         bug_db.duplicatescount = bug_lp.number_of_duplicates
         bug_db.subscriberscount = len(bug_lp.subscriptions)