Remaining examples: Use per-class imports

Task-number: PYSIDE-1112
Change-Id: I8534e911959d6eed2ed6d3f7741e99929ff0125e
Reviewed-by: Christian Tismer <tismer@stackless.com>

2 files changed, 51 insertions, 47 deletions

diff --git a/examples/network/fortuneclient/fortuneclient.py b/examples/network/fortuneclient/fortuneclient.py
index a783a0cbf..156122424 100644
--- a/examples/network/fortuneclient/fortuneclient.py
+++ b/examples/network/fortuneclient/fortuneclient.py
@@ -42,41 +42,48 @@
 
 """PySide6 port of the network/fortuneclient example from Qt v5.x"""
 
-from PySide6 import QtCore, QtGui, QtWidgets, QtNetwork
+import sys
 
+from PySide6.QtCore import QDataStream, QTimer, Qt
+from PySide6.QtGui import QIntValidator
+from PySide6.QtNetwork import QAbstractSocket, QTcpSocket
+from PySide6.QtWidgets import (QApplication, QDialog, QDialogButtonBox, QGridLayout,
+                               QLabel, QLineEdit, QMessageBox, QPushButton,
+                               QVBoxLayout, QWidget)
 
-class Client(QtWidgets.QDialog):
+
+class Client(QDialog):
     def __init__(self, parent=None):
         super(Client, self).__init__(parent)
 
         self._block_size = 0
         self._current_fortune = ''
 
-        host_label = QtWidgets.QLabel("&Server name:")
-        port_label = QtWidgets.QLabel("S&erver port:")
+        host_label = QLabel("&Server name:")
+        port_label = QLabel("S&erver port:")
 
-        self._host_line_edit = QtWidgets.QLineEdit('Localhost')
-        self._port_line_edit = QtWidgets.QLineEdit()
-        self._port_line_edit.setValidator(QtGui.QIntValidator(1, 65535, self))
+        self._host_line_edit = QLineEdit('Localhost')
+        self._port_line_edit = QLineEdit()
+        self._port_line_edit.setValidator(QIntValidator(1, 65535, self))
 
         host_label.setBuddy(self._host_line_edit)
         port_label.setBuddy(self._port_line_edit)
 
-        self._status_label = QtWidgets.QLabel("This examples requires that you run "
+        self._status_label = QLabel("This examples requires that you run "
                 "the Fortune Server example as well.")
 
-        self._get_fortune_button = QtWidgets.QPushButton("Get Fortune")
+        self._get_fortune_button = QPushButton("Get Fortune")
         self._get_fortune_button.setDefault(True)
         self._get_fortune_button.setEnabled(False)
 
-        quit_button = QtWidgets.QPushButton("Quit")
+        quit_button = QPushButton("Quit")
 
-        button_box = QtWidgets.QDialogButtonBox()
+        button_box = QDialogButtonBox()
         button_box.addButton(self._get_fortune_button,
-                QtWidgets.QDialogButtonBox.ActionRole)
-        button_box.addButton(quit_button, QtWidgets.QDialogButtonBox.RejectRole)
+                QDialogButtonBox.ActionRole)
+        button_box.addButton(quit_button, QDialogButtonBox.RejectRole)
 
-        self._tcp_socket = QtNetwork.QTcpSocket(self)
+        self._tcp_socket = QTcpSocket(self)
 
         self._host_line_edit.textChanged.connect(self.enable_get_fortune_button)
         self._port_line_edit.textChanged.connect(self.enable_get_fortune_button)
@@ -85,14 +92,13 @@ class Client(QtWidgets.QDialog):
         self._tcp_socket.readyRead.connect(self.read_fortune)
         self._tcp_socket.errorOccurred.connect(self.display_error)
 
-        main_layout = QtWidgets.QGridLayout()
+        main_layout = QGridLayout(self)
         main_layout.addWidget(host_label, 0, 0)
         main_layout.addWidget(self._host_line_edit, 0, 1)
         main_layout.addWidget(port_label, 1, 0)
         main_layout.addWidget(self._port_line_edit, 1, 1)
         main_layout.addWidget(self._status_label, 2, 0, 1, 2)
         main_layout.addWidget(button_box, 3, 0, 1, 2)
-        self.setLayout(main_layout)
 
         self.setWindowTitle("Fortune Client")
         self._port_line_edit.setFocus()
@@ -105,8 +111,8 @@ class Client(QtWidgets.QDialog):
                 int(self._port_line_edit.text()))
 
     def read_fortune(self):
-        instr = QtCore.QDataStream(self._tcp_socket)
-        instr.setVersion(QtCore.QDataStream.Qt_4_0)
+        instr = QDataStream(self._tcp_socket)
+        instr.setVersion(QDataStream.Qt_4_0)
 
         if self._block_size == 0:
             if self._tcp_socket.bytesAvailable() < 2:
@@ -120,7 +126,7 @@ class Client(QtWidgets.QDialog):
         next_fortune = instr.readString()
 
         if next_fortune == self._current_fortune:
-            QtCore.QTimer.singleShot(0, self.request_new_fortune)
+            QTimer.singleShot(0, self.request_new_fortune)
             return
 
         self._current_fortune = next_fortune
@@ -128,20 +134,20 @@ class Client(QtWidgets.QDialog):
         self._get_fortune_button.setEnabled(True)
 
     def display_error(self, socketError):
-        if socketError == QtNetwork.QAbstractSocket.RemoteHostClosedError:
+        if socketError == QAbstractSocket.RemoteHostClosedError:
             pass
-        elif socketError == QtNetwork.QAbstractSocket.HostNotFoundError:
-            QtWidgets.QMessageBox.information(self, "Fortune Client",
+        elif socketError == QAbstractSocket.HostNotFoundError:
+            QMessageBox.information(self, "Fortune Client",
                     "The host was not found. Please check the host name and "
                     "port settings.")
-        elif socketError == QtNetwork.QAbstractSocket.ConnectionRefusedError:
-            QtWidgets.QMessageBox.information(self, "Fortune Client",
+        elif socketError == QAbstractSocket.ConnectionRefusedError:
+            QMessageBox.information(self, "Fortune Client",
                     "The connection was refused by the peer. Make sure the "
                     "fortune server is running, and check that the host name "
                     "and port settings are correct.")
         else:
             reason = self._tcp_socket.errorString()
-            QtWidgets.QMessageBox.information(self, "Fortune Client",
+            QMessageBox.information(self, "Fortune Client",
                     f"The following error occurred: {reason}.")
 
         self._get_fortune_button.setEnabled(True)
@@ -152,10 +158,7 @@ class Client(QtWidgets.QDialog):
 
 
 if __name__ == '__main__':
-
-    import sys
-
-    app = QtWidgets.QApplication(sys.argv)
+    app = QApplication(sys.argv)
     client = Client()
     client.show()
     sys.exit(client.exec_())
diff --git a/examples/network/fortuneserver/fortuneserver.py b/examples/network/fortuneserver/fortuneserver.py
index f4a32dca0..4761dc33d 100644
--- a/examples/network/fortuneserver/fortuneserver.py
+++ b/examples/network/fortuneserver/fortuneserver.py
@@ -2,7 +2,7 @@
 #############################################################################
 ##
 ## Copyright (C) 2013 Riverbank Computing Limited.
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the Qt for Python examples of the Qt Toolkit.
@@ -43,23 +43,28 @@
 """PySide6 port of the network/fortuneserver example from Qt v5.x"""
 
 import random
+import sys
 
-from PySide6 import QtCore, QtWidgets, QtNetwork
+from PySide6.QtCore import QByteArray, QDataStream, QIODevice, Qt
+from PySide6.QtNetwork import QTcpServer
+from PySide6.QtWidgets import (QApplication, QDialog, QHBoxLayout,
+                               QLabel, QMessageBox, QPushButton,
+                               QVBoxLayout, QWidget)
 
 
-class Server(QtWidgets.QDialog):
+class Server(QDialog):
     def __init__(self, parent=None):
         super(Server, self).__init__(parent)
 
-        status_label = QtWidgets.QLabel()
-        status_label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
-        quit_button = QtWidgets.QPushButton("Quit")
+        status_label = QLabel()
+        status_label.setTextInteractionFlags(Qt.TextBrowserInteraction)
+        quit_button = QPushButton("Quit")
         quit_button.setAutoDefault(False)
 
-        self._tcp_server = QtNetwork.QTcpServer(self)
+        self._tcp_server = QTcpServer(self)
         if not self._tcp_server.listen():
             reason = self._tcp_server.errorString()
-            QtWidgets.QMessageBox.critical(self, "Fortune Server",
+            QMessageBox.critical(self, "Fortune Server",
                     f"Unable to start the server: {reason}.")
             self.close()
             return
@@ -79,22 +84,21 @@ class Server(QtWidgets.QDialog):
         quit_button.clicked.connect(self.close)
         self._tcp_server.newConnection.connect(self.send_fortune)
 
-        button_layout = QtWidgets.QHBoxLayout()
+        button_layout = QHBoxLayout()
         button_layout.addStretch(1)
         button_layout.addWidget(quit_button)
         button_layout.addStretch(1)
 
-        main_layout = QtWidgets.QVBoxLayout()
+        main_layout = QVBoxLayout(self)
         main_layout.addWidget(status_label)
         main_layout.addLayout(button_layout)
-        self.setLayout(main_layout)
 
         self.setWindowTitle("Fortune Server")
 
     def send_fortune(self):
-        block = QtCore.QByteArray()
-        out = QtCore.QDataStream(block, QtCore.QIODevice.WriteOnly)
-        out.setVersion(QtCore.QDataStream.Qt_4_0)
+        block = QByteArray()
+        out = QDataStream(block, QIODevice.WriteOnly)
+        out.setVersion(QDataStream.Qt_4_0)
         out.writeUInt16(0)
         fortune = self.fortunes[random.randint(0, len(self.fortunes) - 1)]
 
@@ -110,10 +114,7 @@ class Server(QtWidgets.QDialog):
 
 
 if __name__ == '__main__':
-
-    import sys
-
-    app = QtWidgets.QApplication(sys.argv)
+    app = QApplication(sys.argv)
     server = Server()
     random.seed(None)
     sys.exit(server.exec_())