1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-18 13:39:02 +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:
dmiller
2014-01-08 19:50:22 +00:00
parent 9210a7f1fa
commit 5c662fffdc
100 changed files with 2287 additions and 1814 deletions

View File

@@ -122,7 +122,6 @@
import gtk
class BWBox(gtk.Box):
"""
"""
@@ -131,38 +130,32 @@ class BWBox(gtk.Box):
"""
self.pack_start(widget, True, True, padding)
def bw_pack_start_expand_nofill(self, widget, padding=0):
"""
"""
self.pack_start(widget, True, False, padding)
def bw_pack_start_noexpand_nofill(self, widget, padding=0):
"""
"""
self.pack_start(widget, False, False, padding)
def bw_pack_end_expand_fill(self, widget, padding=0):
"""
"""
self.pack_end(widget, True, True, padding)
def bw_pack_end_expand_nofill(self, widget, padding=0):
"""
"""
self.pack_end(widget, True, False, padding)
def bw_pack_end_noexpand_nofill(self, widget, padding=0):
"""
"""
self.pack_end(widget, False, False, padding)
class BWHBox(gtk.HBox, BWBox):
"""
"""
@@ -172,7 +165,6 @@ class BWHBox(gtk.HBox, BWBox):
gtk.HBox.__init__(self, homogeneous, spacing)
class BWVBox(gtk.VBox, BWBox):
"""
"""
@@ -182,7 +174,6 @@ class BWVBox(gtk.VBox, BWBox):
gtk.VBox.__init__(self, homogeneous, spacing)
class BWStatusbar(gtk.Statusbar, BWBox):
"""
"""
@@ -192,7 +183,6 @@ class BWStatusbar(gtk.Statusbar, BWBox):
gtk.HBox.__init__(self, homogeneous, spacing)
class BWTable(gtk.Table, BWBox):
"""
"""
@@ -207,14 +197,12 @@ class BWTable(gtk.Table, BWBox):
self.__last_point = (0, 0)
def bw_set_spacing(self, spacing):
"""
"""
self.set_row_spacings(spacing)
self.set_col_spacings(spacing)
def bw_resize(self, rows, columns):
"""
"""
@@ -223,11 +211,10 @@ class BWTable(gtk.Table, BWBox):
self.resize(rows, columns)
def bw_attach_next(self,
child,
xoptions=gtk.EXPAND|gtk.FILL,
yoptions=gtk.EXPAND|gtk.FILL,
xoptions=gtk.EXPAND | gtk.FILL,
yoptions=gtk.EXPAND | gtk.FILL,
xpadding=0,
ypadding=0):
"""
@@ -257,7 +244,6 @@ class BWTable(gtk.Table, BWBox):
self.__last_point = (row, column)
class BWScrolledWindow(gtk.ScrolledWindow):
"""
"""