mirror of
https://github.com/nmap/nmap.git
synced 2025-12-07 13:11:28 +00:00
Apply PEP 8 style guidance to zenmap
Using the pep8 tool (https://pypi.python.org/pypi/pep8), fixed the following style issues: Count Issue 11 E201 whitespace after '[' 8 E203 whitespace before ',' 41 E211 whitespace before '(' 11 E221 multiple spaces before operator 61 E225 missing whitespace around operator 237 E231 missing whitespace after ':' 91 E251 no spaces around keyword / parameter equals 19 E261 at least two spaces before inline comment 41 E301 expected 1 blank line, found 0 200 E302 expected 2 blank lines, found 1 356 E303 too many blank lines (2) 563 E501 line too long (106 characters) 39 E701 multiple statements on one line (colon) 13 E702 multiple statements on one line (semicolon) 4 W291 trailing whitespace 2 W293 blank line contains whitespace 8 W391 blank line at end of file 21 W601 .has_key() is deprecated, use 'in' 2 W602 deprecated form of raising exception The remaining issues are long lines due to very deep data structures. I chose not to alter them, as it would involve backslash-continuation where whitespace is not permitted: ./zenmapGUI/ScanInterface.py:323:80: E501 line too long (90 characters) ./zenmapGUI/ScanInterface.py:456:80: E501 line too long (84 characters) ./zenmapGUI/ScanInterface.py:464:80: E501 line too long (84 characters) ./zenmapGUI/ScanInterface.py:472:80: E501 line too long (122 characters) ./zenmapGUI/ScanInterface.py:479:80: E501 line too long (122 characters) ./zenmapGUI/ScanInterface.py:920:80: E501 line too long (94 characters) ./zenmapGUI/ScanInterface.py:923:80: E501 line too long (93 characters) ./zenmapGUI/MainWindow.py:575:80: E501 line too long (99 characters) ./zenmapGUI/MainWindow.py:906:80: E501 line too long (99 characters)
This commit is contained in:
@@ -128,6 +128,7 @@ from zenmapGUI.higwidgets.higbuttons import HIGButton
|
||||
from zenmapGUI.higwidgets.higscrollers import HIGScrolledWindow
|
||||
import zenmapCore.I18N
|
||||
|
||||
|
||||
def status_data_func(widget, cell_renderer, model, iter):
|
||||
entry = model.get_value(iter, 0)
|
||||
if entry.running:
|
||||
@@ -143,14 +144,17 @@ def status_data_func(widget, cell_renderer, model, iter):
|
||||
status = _("Canceled")
|
||||
cell_renderer.set_property("text", status)
|
||||
|
||||
|
||||
def command_data_func(widget, cell_renderer, model, iter):
|
||||
entry = model.get_value(iter, 0)
|
||||
cell_renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
|
||||
cell_renderer.set_property("text", entry.get_command_string())
|
||||
|
||||
|
||||
class ScanScanListPage(HIGVBox):
|
||||
"""This is the "Scans" scan results tab. It the list of running and finished
|
||||
scans contained in the ScansListStore passed to the constructor."""
|
||||
"""This is the "Scans" scan results tab. It the list of running and
|
||||
finished scans contained in the ScansListStore passed to the
|
||||
constructor."""
|
||||
def __init__(self, scans_store):
|
||||
HIGVBox.__init__(self)
|
||||
|
||||
@@ -159,7 +163,8 @@ class ScanScanListPage(HIGVBox):
|
||||
scans_store.connect("row-changed", self._row_changed)
|
||||
|
||||
self.scans_list = gtk.TreeView(scans_store)
|
||||
self.scans_list.get_selection().connect("changed", self._selection_changed)
|
||||
self.scans_list.get_selection().connect(
|
||||
"changed", self._selection_changed)
|
||||
|
||||
status_col = gtk.TreeViewColumn(_("Status"))
|
||||
cell = gtk.CellRendererText()
|
||||
@@ -193,9 +198,9 @@ class ScanScanListPage(HIGVBox):
|
||||
self.cancel_button = HIGButton(_("Cancel Scan"), gtk.STOCK_CANCEL)
|
||||
buttonbox.pack_start(self.cancel_button, False)
|
||||
|
||||
hbox.pack_start(buttonbox, padding = 4)
|
||||
hbox.pack_start(buttonbox, padding=4)
|
||||
|
||||
self.pack_start(hbox, False, padding = 4)
|
||||
self.pack_start(hbox, False, padding=4)
|
||||
|
||||
self._update()
|
||||
|
||||
@@ -206,13 +211,13 @@ class ScanScanListPage(HIGVBox):
|
||||
self._update()
|
||||
|
||||
def _update(self):
|
||||
# Make the Cancel button sensitive or not depending on whether a running
|
||||
# scan is selected.
|
||||
# Make the Cancel button sensitive or not depending on whether a
|
||||
# running scan is selected.
|
||||
tree_selection = self.scans_list.get_selection()
|
||||
if tree_selection is None:
|
||||
# I can't find anything in the PyGTK documentation that suggests
|
||||
# this is possible, but we received many crash reports that indicate
|
||||
# it is.
|
||||
# this is possible, but we received many crash reports that
|
||||
# indicate it is.
|
||||
model, selection = None, []
|
||||
else:
|
||||
model, selection = tree_selection.get_selected_rows()
|
||||
|
||||
Reference in New Issue
Block a user