diff --git a/qubesmanager/about.py b/qubesmanager/about.py index e28d920c..b12ae361 100644 --- a/qubesmanager/about.py +++ b/qubesmanager/about.py @@ -1,6 +1,5 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # coding=utf-8 -# pylint: skip-file # # The Qubes OS Project, http://www.qubes-os.org # @@ -21,16 +20,15 @@ # with this program; if not, see . # # -from PyQt4.QtCore import SIGNAL, SLOT -from PyQt4.QtGui import QDialog, QIcon +from PyQt4.QtCore import SIGNAL, SLOT # pylint: disable=import-error +from PyQt4.QtGui import QDialog, QIcon # pylint: disable=import-error from qubesmanager.releasenotes import ReleaseNotesDialog from qubesmanager.informationnotes import InformationNotesDialog -from .ui_about import * +from . import ui_about # pylint: disable=no-name-in-module - -class AboutDialog(Ui_AboutDialog, QDialog): +class AboutDialog(ui_about.Ui_AboutDialog, QDialog): def __init__(self): super(AboutDialog, self).__init__() diff --git a/qubesmanager/informationnotes.py b/qubesmanager/informationnotes.py index d0b82f1d..b512d3f8 100644 --- a/qubesmanager/informationnotes.py +++ b/qubesmanager/informationnotes.py @@ -1,6 +1,5 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # coding=utf-8 -# pylint: skip-file # # The Qubes OS Project, http://www.qubes-os.org # @@ -21,17 +20,19 @@ # with this program; if not, see . # # -from PyQt4.QtCore import SIGNAL -from PyQt4.QtGui import QDialog, QIcon +from PyQt4.QtGui import QDialog # pylint: disable=import-error -from .ui_informationnotes import * +from . import ui_informationnotes # pylint: disable=no-name-in-module import subprocess -class InformationNotesDialog(Ui_InformationNotesDialog, QDialog): +class InformationNotesDialog(ui_informationnotes.Ui_InformationNotesDialog, + QDialog): + # pylint: disable=too-few-public-methods def __init__(self): super(InformationNotesDialog, self).__init__() self.setupUi(self) - details = subprocess.check_output(['/usr/libexec/qubes-manager/qvm_about.sh']) - self.informationNotes.setText(details) + details = subprocess.check_output( + ['/usr/libexec/qubes-manager/qvm_about.sh']) + self.informationNotes.setText(details.decode()) diff --git a/qubesmanager/releasenotes.py b/qubesmanager/releasenotes.py index da3f9074..fd781d5d 100644 --- a/qubesmanager/releasenotes.py +++ b/qubesmanager/releasenotes.py @@ -1,6 +1,5 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # coding=utf-8 -# pylint: skip-file # # The Qubes OS Project, http://www.qubes-os.org # @@ -21,13 +20,13 @@ # with this program; if not, see . # # -from PyQt4.QtCore import SIGNAL -from PyQt4.QtGui import QDialog, QIcon +from PyQt4.QtGui import QDialog # pylint: disable=import-error -from .ui_releasenotes import * +from . import ui_releasenotes # pylint: disable=no-name-in-module -class ReleaseNotesDialog(Ui_ReleaseNotesDialog, QDialog): +class ReleaseNotesDialog(ui_releasenotes.Ui_ReleaseNotesDialog, QDialog): + # pylint: disable=too-few-public-methods def __init__(self): super(ReleaseNotesDialog, self).__init__()