Ver código fonte

Fixed 'About' window

Surprisingly, it has not been touched since 3.2. It should work now.
Marta Marczykowska-Górecka 6 anos atrás
pai
commit
1cee3a5fe3

+ 5 - 7
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 <http://www.gnu.org/licenses/>.
 #
 #
-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__()
 

+ 9 - 8
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 <http://www.gnu.org/licenses/>.
 #
 #
-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())

+ 5 - 6
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 <http://www.gnu.org/licenses/>.
 #
 #
-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__()