Merge ~pieq/bugit/+git/qabro:python3-port into bugit:master

[Pierre Equoy]

To test, you can build a snap. Since wadllib was updated on both xenial and bionic, the fix to get binary launchpad attachments to work with Python3 wadllib should be in the repo, so your snap should include it. You can check this by creating a bug with qabro and opening the sosreport tar.xz attachment in the created bug.

[Maciej Kisielewski (kissiel)]

A few thing I found I think need fixing. See below.

review: Needs Fixing

[Pierre Equoy (pieq)]

Thanks for the feedback Maciek! I'll take that into account. Please see one comment inline.

[Maciej Kisielewski (kissiel)]

Re below.

[Pierre Equoy (pieq)]

I made the modifications you suggested.

Tested by building a snap (`snapcraft cleanbuild`) and submitting a few bug reports with it on Launchpad Staging instance.

review: Needs Resubmitting

[Maciej Kisielewski (kissiel)]

Good stuff. +1.

On some lazy afternoon you may consider fixing PEP8 issues for the code.

review: Approve

[Pierre Equoy (pieq)]

Thanks! Yes, I need to hook some flake8 to my work process... It's on my todo list :)

diff --git a/qabro/__init__.py b/qabro/__init__.py
index 53fb41c..358ed45 100644
--- a/qabro/__init__.py
+++ b/qabro/__init__.py
@@ -1,10 +1,8 @@
-#!usr/bin/env python
-
 import logging, os, subprocess, sys
 from time import sleep
 
-from bug_assistant import BugAssistant
-from ui import ReportScreen
+from qabro.bug_assistant import BugAssistant
+from qabro.ui import ReportScreen
 
 def main():
     if os.geteuid() == 0:
@@ -16,7 +14,8 @@ def main():
         sys.exit(("Cannot determine snap name. "
                   "Please install this tool using the snap command."))
 
-    output = subprocess.check_output(['snap', 'list', snap_name])
+    output = subprocess.check_output(['snap', 'list', snap_name],
+                                     universal_newlines=True)
 
     if 'devmode' not in output:
         sys.exit("This tool requires --devmode option to run properly.")
@@ -36,18 +35,10 @@ def start_ui():
         try: 
             result = ba.file_bug()
         except Exception as exc:
+            ui.message.set_text([('error', "Error: "), str(exc)])
             logging.error(exc)
-            error_msg = ''
-            if hasattr(exc, 'content'):
-                error_msg = exc.content
-            else:
-                error_msg = exc.message
-            ui.message.set_text([('error', "Error: "), error_msg])
             ui.run()
             ba.update(ui.report())
         else:
             print(result)
             break
-
-if __name__ == '__main__':
-    main()
diff --git a/qabro/bug_assistant.py b/qabro/bug_assistant.py
index 6ebf4b6..87cbb62 100644
--- a/qabro/bug_assistant.py
+++ b/qabro/bug_assistant.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-from __future__ import print_function, unicode_literals
-
 import getpass, os, re, subprocess, sys, tarfile
 from collections import Counter
 from httplib2 import ServerNotFoundError
@@ -227,7 +224,7 @@ class AttachmentAssistant:
                 command = ["sudo", "env", "PATH={}".format(p), "sosreport",
                            "--no-report", "--batch", "--tmp-dir", home_dir,
                            "--config-file", conf_file]
-                output = subprocess.check_output(command)
+                output = subprocess.check_output(command).decode(sys.stdout.encoding)
                 archive_path = output.splitlines()[-6].strip()
                 print("Report generated: {}".format(archive_path))
                 command = ["sudo", "chown", "{}:{}".format(user, user), archive_path]
@@ -262,7 +259,7 @@ class AttachmentAssistant:
         if os.path.exists(classic_path):
             rootpath = classic_path
         else:
-            out = subprocess.check_output(["snap", "list"])
+            out = subprocess.check_output(["snap", "list"]).decode(sys.stdout.encoding)
             snap_name_list = [e for e in out.split() if 'checkbox' in e]
             if snap_name_list:
                 snap_name = snap_name_list[0]
@@ -297,7 +294,7 @@ class AttachmentAssistant:
                        "oops", "esrt", "uefibootpath", "uefirtvariable",
                        "uefirttime", "uefirtmisc", "--acpitests", "--log-level=high"]
             subprocess.call(command)
-            with open(logfile) as f:
+            with open(logfile, 'rb') as f:
                 content = f.read()
             self.attachments['fwts_results.log'] = content
         else:
@@ -321,7 +318,7 @@ class AttachmentAssistant:
         buildstamp = '/etc/buildstamp'
         if os.path.isfile(buildstamp):
             standard_info['Image'] = subprocess.check_output(
-                ['tail', '-n', '1', buildstamp])
+                ['tail', '-n', '1', buildstamp]).decode(sys.stdout.encoding)
 
         p = os.getenv('PATH')
 
@@ -336,11 +333,13 @@ class AttachmentAssistant:
         
         for dmi_value in ['system-manufacturer', 'system-product-name', 'bios-version']:
             standard_info[dmi_value] = subprocess.check_output(
-                command + [dmi_value]).strip()
+                command + [dmi_value]).decode(sys.stdout.encoding).strip()
 
         standard_info['CPU'] = cls.get_cpu_info()
 
-        lspci_output = subprocess.check_output(['lspci']).splitlines()
+        lspci_output = (subprocess.check_output(['lspci'])
+                        .decode(sys.stdout.encoding)
+                        .splitlines())
         standard_info['GPU'] = '\n'.join([line for line in lspci_output
                                           if 'VGA' in line])
         return standard_info
@@ -373,7 +372,7 @@ class AttachmentAssistant:
                 cpu_names[cpu_name] += 1
 
         cpu_names_str = ['{} ({}x)'.format(cpu_name, count)
-                         for cpu_name, count in cpu_names.iteritems()]
+                         for cpu_name, count in cpu_names.items()]
 
         return '\n'.join(cpu_names_str)
 
diff --git a/qabro/ui.py b/qabro/ui.py
index b87ace4..806f78e 100644
--- a/qabro/ui.py
+++ b/qabro/ui.py
@@ -1,11 +1,9 @@
-#!/usr/bin/env python
-from __future__ import unicode_literals, print_function
 from time import sleep
 import sys
 import urwid
 
-from bug_assistant import BugReport
-from __version__ import __version__ as qversion, __title__ as qtitle
+from qabro.bug_assistant import BugReport
+from qabro.__version__ import __version__ as qversion, __title__ as qtitle
 
 class ReportScreen:
     palette = [
diff --git a/setup.py b/setup.py
index db9e1e5..9ca0a66 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os
 from codecs import open
 from setuptools import setup
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b7213b9..94d79e9 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -28,7 +28,6 @@ apps:
 parts:
   qabro:
     plugin: python
-    python-version: python2
     source: .
     build-packages:
       - libffi-dev