Skip to content

Commit c0f3659

Browse files
Auto pep8
1 parent bdb097a commit c0f3659

File tree

102 files changed

+4507
-4463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+4507
-4463
lines changed

gns3/console_view.py

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from .modules import MODULES
3030
from .local_config import LocalConfig
3131

32+
3233
class ConsoleView(PyCutExt, ConsoleCmd):
3334

3435
def __init__(self, parent):

gns3/dialogs/appliance_wizard.py

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434

3535
class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
36+
3637
def __init__(self, parent, path):
3738
super().__init__(parent)
3839

gns3/dialogs/export_debug_dialog.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def _getDebugData(self):
9494
memory=psutil.virtual_memory(),
9595
cpu=psutil.cpu_times(),
9696
connections=connections,
97-
addrs="\n".join(["* {}: {}".format(key, val) for key,val in psutil.net_if_addrs().items()])
97+
addrs="\n".join(["* {}: {}".format(key, val) for key, val in psutil.net_if_addrs().items()])
9898
)
9999
for proc in psutil.process_iter():
100100
try:

gns3/dialogs/node_properties_dialog.py

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ def _loadNodeItems(self):
6565
if not node_item.node().initialized():
6666
continue
6767

68-
6968
# If something of one of the displayed nodes we reload everything
7069
node_item.node().updated_signal.connect(self.resetSettings)
7170

gns3/dialogs/preferences_dialog.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,14 @@ def reject(self):
170170

171171
if self._modified:
172172
reply = QtWidgets.QMessageBox.warning(self,
173-
"Preferences",
174-
"You have unsaved preferences.\n\nContinue without saving?",
175-
QtWidgets.QMessageBox.Yes,
176-
QtWidgets.QMessageBox.No)
173+
"Preferences",
174+
"You have unsaved preferences.\n\nContinue without saving?",
175+
QtWidgets.QMessageBox.Yes,
176+
QtWidgets.QMessageBox.No)
177177
if reply == QtWidgets.QMessageBox.No:
178178
return
179179
QtWidgets.QDialog.reject(self)
180180

181-
182181
def accept(self):
183182
"""
184183
Saves the preferences and closes this dialog.

gns3/dialogs/vm_with_images_wizard.py

-1
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,3 @@ def _getImagesFromServerCallback(self, result, error=False, **kwargs):
168168
QtWidgets.QMessageBox.critical(self, "Images", "Please upgrade the gns3 server to a version >= 1.4.0b4")
169169
return
170170
combo_box.addItem(vm["path"], vm)
171-

gns3/dialogs/vm_wizard.py

-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def __init__(self, devices, use_local_server, parent):
5151
if hasattr(self, "uiLoadBalanceCheckBox"):
5252
self.uiLoadBalanceCheckBox.toggled.connect(self._loadBalanceToggledSlot)
5353

54-
5554
# By default we use the local server
5655
self._server = Servers.instance().localServer()
5756
self.uiLocalRadioButton.setChecked(True)
@@ -61,7 +60,6 @@ def __init__(self, devices, use_local_server, parent):
6160
# skip the server page if we use the local server
6261
self.setStartId(1)
6362

64-
6563
def _vmToggledSlot(self, checked):
6664
"""
6765
Slot for when the VM radio button is toggled.

gns3/graphics_view.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ def showInFileManagerSlot(self):
972972
break
973973

974974
if os.path.exists(vm_dir):
975-
log.debug("Open %s in file manage" )
975+
log.debug("Open %s in file manage")
976976
if QtGui.QDesktopServices.openUrl(QtCore.QUrl.fromLocalFile(vm_dir)) is False:
977977
QtWidgets.QMessageBox.critical(self, "Show in file manager", "Failed to open {}".format(vm_dir))
978978
break

gns3/image_manager.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def _getRelativeImagePath(self, path, vm_type):
151151
img_directory = self.getDirectoryForType(vm_type)
152152
path = os.path.abspath(path)
153153
if os.path.commonprefix([img_directory, path]) == img_directory:
154-
return os.path.relpath(path, img_directory)
154+
return os.path.relpath(path, img_directory)
155155
return path
156156

157157
def getDirectory(self):

gns3/iouvm_converter.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
from gns3.local_config import LocalConfig
3838
from gns3.ui.iouvm_converter_wizard_ui import Ui_IOUVMConverterWizard
3939

40+
4041
class IOUVMConverterWizard(QtWidgets.QWizard, Ui_IOUVMConverterWizard):
42+
4143
def __init__(self, parent=None):
4244
super().__init__(parent)
4345
self.setupUi(self)
@@ -47,7 +49,7 @@ def __init__(self, parent=None):
4749
self.setOptions(QtWidgets.QWizard.NoDefaultButton)
4850

4951
# set the window icon
50-
self.setWindowIcon(QtGui.QIcon(":/images/gns3.ico"))# this info is necessary for QSettings
52+
self.setWindowIcon(QtGui.QIcon(":/images/gns3.ico")) # this info is necessary for QSettings
5153

5254
config = self._loadConfig()
5355
self.uiPushButtonBrowse.clicked.connect(self._browseTopologiesSlot)
@@ -148,7 +150,8 @@ def _configurationFile(self):
148150
else:
149151
filename = "gns3_gui.conf"
150152
directory = LocalConfig.configDirectory()
151-
return os.path.join(directory, filename)
153+
return os.path.join(directory, filename)
154+
152155

153156
def main():
154157
app = QtWidgets.QApplication(sys.argv)

gns3/items/node_item.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ def __init__(self, node):
5151
effect.setColor(QtGui.QColor("black"))
5252
effect.setStrength(0.8)
5353
#effect = QtWidgets.QGraphicsDropShadowEffect()
54-
#effect.setColor(QtGui.QColor("darkGray"))
55-
#effect.setBlurRadius(0)
54+
# effect.setColor(QtGui.QColor("darkGray"))
55+
# effect.setBlurRadius(0)
5656
#effect.setOffset(3, 3)
5757
self.setGraphicsEffect(effect)
5858
self.graphicsEffect().setEnabled(False)

gns3/local_config.py

-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ def _copySettings(local, default):
268268

269269
return copy.deepcopy(settings)
270270

271-
272271
def saveSectionSettings(self, section, settings):
273272
"""
274273
Save all the settings in a given section.

gns3/main.py

-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ def version(version_string):
231231
global app
232232
app = Application(sys.argv)
233233

234-
235234
# save client logging info to a file
236235
logfile = os.path.join(LocalConfig.configDirectory(), "gns3_gui.log")
237236

gns3/main_window.py

-1
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,6 @@ def _running_nodes(self):
12021202
running_nodes.append(node.name())
12031203
return running_nodes
12041204

1205-
12061205
def saveProjectAs(self):
12071206
"""
12081207
Saves a project to another location/name.

gns3/modules/builtin/ui/cloud_configuration_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_cloudConfigPageWidget(object):
13+
1214
def setupUi(self, cloudConfigPageWidget):
1315
cloudConfigPageWidget.setObjectName("cloudConfigPageWidget")
1416
cloudConfigPageWidget.resize(653, 478)
@@ -455,4 +457,3 @@ def retranslateUi(self, cloudConfigPageWidget):
455457
self.uiNIOsTabWidget.setTabText(self.uiNIOsTabWidget.indexOf(self.NIONullTab), _translate("cloudConfigPageWidget", "NULL"))
456458
self.uiNameLabel.setText(_translate("cloudConfigPageWidget", "Name:"))
457459
self.uiNIOsTabWidget.setTabText(self.uiNIOsTabWidget.indexOf(self.MiscTab), _translate("cloudConfigPageWidget", "Misc."))
458-

gns3/modules/docker/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ def preferencePages():
238238
from .pages.docker_preferences_page import DockerPreferencesPage
239239
from .pages.docker_vm_preferences_page import DockerVMPreferencesPage
240240

241-
242241
from gns3.local_config import LocalConfig
243242
if not LocalConfig.instance().experimental():
244243
return []

gns3/modules/docker/ui/docker_preferences_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_DockerPreferencesPageWidget(object):
13+
1214
def setupUi(self, DockerPreferencesPageWidget):
1315
DockerPreferencesPageWidget.setObjectName("DockerPreferencesPageWidget")
1416
DockerPreferencesPageWidget.resize(200, 200)
@@ -48,4 +50,3 @@ def retranslateUi(self, DockerPreferencesPageWidget):
4850
self.uiUseLocalServercheckBox.setText(_translate("DockerPreferencesPageWidget", "Use the local server"))
4951
self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiServerSettingsTabWidget), _translate("DockerPreferencesPageWidget", "General settings"))
5052
self.uiRestoreDefaultsPushButton.setText(_translate("DockerPreferencesPageWidget", "Restore defaults"))
51-

gns3/modules/docker/ui/docker_vm_configuration_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_dockerVMConfigPageWidget(object):
13+
1214
def setupUi(self, dockerVMConfigPageWidget):
1315
dockerVMConfigPageWidget.setObjectName("dockerVMConfigPageWidget")
1416
dockerVMConfigPageWidget.resize(509, 346)
@@ -57,4 +59,3 @@ def retranslateUi(self, dockerVMConfigPageWidget):
5759
self.uiCMDLabel.setText(_translate("dockerVMConfigPageWidget", "CMD:"))
5860
self.uiImageListLabel.setText(_translate("dockerVMConfigPageWidget", "Image name:"))
5961
self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.tab), _translate("dockerVMConfigPageWidget", "General settings"))
60-

gns3/modules/docker/ui/docker_vm_preferences_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_DockerVMPreferencesPageWidget(object):
13+
1214
def setupUi(self, DockerVMPreferencesPageWidget):
1315
DockerVMPreferencesPageWidget.setObjectName("DockerVMPreferencesPageWidget")
1416
DockerVMPreferencesPageWidget.resize(505, 350)
@@ -73,4 +75,3 @@ def retranslateUi(self, DockerVMPreferencesPageWidget):
7375
self.uiDeleteDockerVMPushButton.setText(_translate("DockerVMPreferencesPageWidget", "&Delete"))
7476
self.uiDockerVMInfoTreeWidget.headerItem().setText(0, _translate("DockerVMPreferencesPageWidget", "1"))
7577
self.uiDockerVMInfoTreeWidget.headerItem().setText(1, _translate("DockerVMPreferencesPageWidget", "2"))
76-

gns3/modules/docker/ui/docker_vm_wizard_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_DockerVMWizard(object):
13+
1214
def setupUi(self, DockerVMWizard):
1315
DockerVMWizard.setObjectName("DockerVMWizard")
1416
DockerVMWizard.resize(585, 424)
@@ -91,4 +93,3 @@ def retranslateUi(self, DockerVMWizard):
9193
self.uiImageWizardPage.setTitle(_translate("DockerVMWizard", "Docker Virtual Machine"))
9294
self.uiImageWizardPage.setSubTitle(_translate("DockerVMWizard", "Please choose a Docker virtual machine from the list."))
9395
self.uiImageListLabel.setText(_translate("DockerVMWizard", "Image list:"))
94-

gns3/modules/dynamips/nodes/ethernet_switch.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def setup(self, name=None, device_id=None, initial_ports=[]):
8484
self._ports.append(port)
8585
self._settings["ports"][port.portNumber()] = {"type": initial_port["type"],
8686
"vlan": initial_port["vlan"],
87-
"ethertype": initial_port.get("ethertype","")}
87+
"ethertype": initial_port.get("ethertype", "")}
8888

8989
params = {"name": name,
9090
"device_type": "ethernet_switch"}
@@ -231,9 +231,9 @@ def info(self):
231231
port_ethertype_info = "({})".format(port_ethertype)
232232

233233
port_info += " Port {name} is in {port_type} {port_ethertype_info} mode, with {port_vlan_info},\n".format(name=port.name(),
234-
port_type=port_type,
235-
port_ethertype_info=port_ethertype_info,
236-
port_vlan_info=port_vlan_info)
234+
port_type=port_type,
235+
port_ethertype_info=port_ethertype_info,
236+
port_vlan_info=port_vlan_info)
237237
port_info += " {port_description}\n".format(port_description=port.description())
238238

239239
return info + port_info

gns3/modules/dynamips/ui/atm_bridge_configuration_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_atmBridgeConfigPageWidget(object):
13+
1214
def setupUi(self, atmBridgeConfigPageWidget):
1315
atmBridgeConfigPageWidget.setObjectName("atmBridgeConfigPageWidget")
1416
atmBridgeConfigPageWidget.resize(432, 358)
@@ -150,4 +152,3 @@ def retranslateUi(self, atmBridgeConfigPageWidget):
150152
self.uiDeletePushButton.setText(_translate("atmBridgeConfigPageWidget", "&Delete"))
151153
self.uiGeneralGroupBox.setTitle(_translate("atmBridgeConfigPageWidget", "General"))
152154
self.uiNameLabel.setText(_translate("atmBridgeConfigPageWidget", "Name:"))
153-

gns3/modules/dynamips/ui/atm_switch_configuration_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_atmSwitchConfigPageWidget(object):
13+
1214
def setupUi(self, atmSwitchConfigPageWidget):
1315
atmSwitchConfigPageWidget.setObjectName("atmSwitchConfigPageWidget")
1416
atmSwitchConfigPageWidget.resize(459, 419)
@@ -184,4 +186,3 @@ def retranslateUi(self, atmSwitchConfigPageWidget):
184186
self.uiDestinationPortLabel.setText(_translate("atmSwitchConfigPageWidget", "Port:"))
185187
self.uiDestinationVPILabel.setText(_translate("atmSwitchConfigPageWidget", "VPI:"))
186188
self.uiDestinationVCILabel.setText(_translate("atmSwitchConfigPageWidget", "VCI:"))
187-

gns3/modules/dynamips/ui/dynamips_preferences_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_DynamipsPreferencesPageWidget(object):
13+
1214
def setupUi(self, DynamipsPreferencesPageWidget):
1315
DynamipsPreferencesPageWidget.setObjectName("DynamipsPreferencesPageWidget")
1416
DynamipsPreferencesPageWidget.resize(435, 200)
@@ -107,4 +109,3 @@ def retranslateUi(self, DynamipsPreferencesPageWidget):
107109
self.uiSparseMemorySupportCheckBox.setText(_translate("DynamipsPreferencesPageWidget", "Enable sparse memory support"))
108110
self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiAdvancedSettingsTabWidget), _translate("DynamipsPreferencesPageWidget", "Advanced settings"))
109111
self.uiRestoreDefaultsPushButton.setText(_translate("DynamipsPreferencesPageWidget", "Restore defaults"))
110-

gns3/modules/dynamips/ui/ethernet_hub_configuration_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_ethernetHubConfigPageWidget(object):
13+
1214
def setupUi(self, ethernetHubConfigPageWidget):
1315
ethernetHubConfigPageWidget.setObjectName("ethernetHubConfigPageWidget")
1416
ethernetHubConfigPageWidget.resize(381, 270)
@@ -56,4 +58,3 @@ def retranslateUi(self, ethernetHubConfigPageWidget):
5658
self.uiSettingsGroupBox.setTitle(_translate("ethernetHubConfigPageWidget", "Settings"))
5759
self.uiNameLabel.setText(_translate("ethernetHubConfigPageWidget", "Name:"))
5860
self.uiPortsLabel.setText(_translate("ethernetHubConfigPageWidget", "Number of ports:"))
59-

gns3/modules/dynamips/ui/ethernet_switch_configuration_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_ethernetSwitchConfigPageWidget(object):
13+
1214
def setupUi(self, ethernetSwitchConfigPageWidget):
1315
ethernetSwitchConfigPageWidget.setObjectName("ethernetSwitchConfigPageWidget")
1416
ethernetSwitchConfigPageWidget.resize(397, 315)
@@ -141,4 +143,3 @@ def retranslateUi(self, ethernetSwitchConfigPageWidget):
141143
self.uiPortEtherTypeComboBox.setItemText(3, _translate("ethernetSwitchConfigPageWidget", "0x9200"))
142144
self.uiAddPushButton.setText(_translate("ethernetSwitchConfigPageWidget", "&Add"))
143145
self.uiDeletePushButton.setText(_translate("ethernetSwitchConfigPageWidget", "&Delete"))
144-

gns3/modules/dynamips/ui/frame_relay_switch_configuration_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_frameRelaySwitchConfigPageWidget(object):
13+
1214
def setupUi(self, frameRelaySwitchConfigPageWidget):
1315
frameRelaySwitchConfigPageWidget.setObjectName("frameRelaySwitchConfigPageWidget")
1416
frameRelaySwitchConfigPageWidget.resize(499, 405)
@@ -147,4 +149,3 @@ def retranslateUi(self, frameRelaySwitchConfigPageWidget):
147149
self.uiDestinationDLCILabel.setText(_translate("frameRelaySwitchConfigPageWidget", "DLCI:"))
148150
self.uiAddPushButton.setText(_translate("frameRelaySwitchConfigPageWidget", "&Add"))
149151
self.uiDeletePushButton.setText(_translate("frameRelaySwitchConfigPageWidget", "&Delete"))
150-

gns3/modules/dynamips/ui/ios_router_configuration_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_iosRouterConfigPageWidget(object):
13+
1214
def setupUi(self, iosRouterConfigPageWidget):
1315
iosRouterConfigPageWidget.setObjectName("iosRouterConfigPageWidget")
1416
iosRouterConfigPageWidget.resize(476, 510)
@@ -617,4 +619,3 @@ def retranslateUi(self, iosRouterConfigPageWidget):
617619
self.uiSensor4Label.setText(_translate("iosRouterConfigPageWidget", "NPE outlet:"))
618620
self.uiSensor4SpinBox.setSuffix(_translate("iosRouterConfigPageWidget", " C"))
619621
self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiEnvironmentPageWidget), _translate("iosRouterConfigPageWidget", "Environment"))
620-

gns3/modules/dynamips/ui/ios_router_preferences_page_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_IOSRouterPreferencesPageWidget(object):
13+
1214
def setupUi(self, IOSRouterPreferencesPageWidget):
1315
IOSRouterPreferencesPageWidget.setObjectName("IOSRouterPreferencesPageWidget")
1416
IOSRouterPreferencesPageWidget.resize(505, 350)
@@ -76,4 +78,3 @@ def retranslateUi(self, IOSRouterPreferencesPageWidget):
7678
self.uiDecompressIOSPushButton.setText(_translate("IOSRouterPreferencesPageWidget", "&Decompress"))
7779
self.uiEditIOSRouterPushButton.setText(_translate("IOSRouterPreferencesPageWidget", "&Edit"))
7880
self.uiDeleteIOSRouterPushButton.setText(_translate("IOSRouterPreferencesPageWidget", "&Delete"))
79-

gns3/modules/dynamips/ui/ios_router_wizard_ui.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11+
1112
class Ui_IOSRouterWizard(object):
13+
1214
def setupUi(self, IOSRouterWizard):
1315
IOSRouterWizard.setObjectName("IOSRouterWizard")
1416
IOSRouterWizard.resize(585, 398)
@@ -336,4 +338,3 @@ def retranslateUi(self, IOSRouterWizard):
336338
self.uiIdlePCWizardPage.setSubTitle(_translate("IOSRouterWizard", "An idle-pc value is necessary to prevent IOS to use 100% of your processor or one of its core."))
337339
self.uiIdlepcLabel.setText(_translate("IOSRouterWizard", "Idle-PC:"))
338340
self.uiIdlePCFinderPushButton.setText(_translate("IOSRouterWizard", "Idle-PC finder"))
339-

0 commit comments

Comments
 (0)