PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 06:01:28 +00:00
Code Issues Projects Releases Wiki Activity

Apply PEP 8 style guidance to zenmap

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

97
zenmap/radialnet/gui/NodeNotebook.py
View File

@@ -129,27 +129,27 @@ from radialnet.bestwidgets.labels import *
from radialnet.bestwidgets.textview import *
PORTS_HEADER = [_('Port'), _('Protocol'), _('State'), _('Service'), _('Method')]
PORTS_HEADER = [
_('Port'), _('Protocol'), _('State'), _('Service'), _('Method')]
EXTRAPORTS_HEADER = [_('Count'), _('State'), _('Reasons')]
SERVICE_COLORS = {'open' : '#ffd5d5',
'closed' : '#d5ffd5',
'filtered' : '#ffffd5',
'unfiltered' : '#ffd5d5',
'open|filtered' : '#ffd5d5',
'closed|filtered' : '#d5ffd5'}
SERVICE_COLORS = {'open': '#ffd5d5',
'closed': '#d5ffd5',
'filtered': '#ffffd5',
'unfiltered': '#ffd5d5',
'open|filtered': '#ffd5d5',
'closed|filtered': '#d5ffd5'}
UNKNOWN_SERVICE_COLOR = '#d5d5d5'
TRACE_HEADER = [_('TTL'), _('RTT'), _('IP'), _('Hostname')]
TRACE_TEXT = _("""\
Traceroute on port <b>%s/%s</b> totalized <b>%d</b> known hops.\
""")
TRACE_TEXT = _(
"Traceroute on port <b>%s/%s</b> totalized <b>%d</b> known hops.")
NO_TRACE_TEXT = _("No traceroute information available.")
HOP_COLOR = {'known' : '#ffffff',
'unknown' : '#cccccc'}
HOP_COLOR = {'known': '#ffffff',
'unknown': '#cccccc'}
SYSTEM_ADDRESS_TEXT = "[%s] %s"
@@ -162,6 +162,7 @@ TCP_SEQ_NOTE = _("""\
<b>*</b> TCP sequence <i>index</i> equal to %d and <i>difficulty</i> is "%s".\
""")
def get_service_color(state):
color = SERVICE_COLORS.get(state)
if color is None:
@@ -182,7 +183,6 @@ class NodeNotebook(gtk.Notebook):
self.__create_widgets()
def __create_widgets(self):
"""
"""
@@ -197,7 +197,6 @@ class NodeNotebook(gtk.Notebook):
self.append_page(self.__trace_page, BWLabel(_('Traceroute')))
class ServicesPage(gtk.Notebook):
"""
"""
@@ -213,7 +212,6 @@ class ServicesPage(gtk.Notebook):
self.__create_widgets()
def __create_widgets(self):
"""
"""
@@ -256,13 +254,13 @@ class ServicesPage(gtk.Notebook):
color = get_service_color(port['state']['state'])
if port['service'].has_key('name'):
if 'name' in port['service']:
service_name = port['service']['name']
else:
service_name = _('<unknown>')
if port['service'].has_key('method'):
if 'method' in port['service']:
service_method = port['service']['method']
else:
@@ -330,7 +328,7 @@ class ServicesPage(gtk.Notebook):
column = gtk.TreeViewColumn(PORTS_HEADER[i],
self.__cell,
text = i)
text=i)
self.__ports_column.append(column)
@@ -338,9 +336,9 @@ class ServicesPage(gtk.Notebook):
self.__ports_column[i].set_resizable(True)
self.__ports_column[i].set_sort_column_id(i)
self.__ports_column[i].set_attributes(self.__cell,
text = i,
background = 5,
editable = 6)
text=i,
background=5,
editable=6)
self.__ports_treeview.append_column(self.__ports_column[i])
@@ -364,12 +362,9 @@ class ServicesPage(gtk.Notebook):
color = get_service_color(xports['state'])
number_of_xports += xports['count']
reference = self.__xports_store.append(None,
[xports['count'],
xports['state'],
", ".join(xports['reason']),
color,
True])
reference = self.__xports_store.append(
None, [xports['count'], xports['state'],
", ".join(xports['reason']), color, True])
for xreason in xports['all_reason']:
self.__xports_store.append(reference,
@@ -385,7 +380,7 @@ class ServicesPage(gtk.Notebook):
column = gtk.TreeViewColumn(EXTRAPORTS_HEADER[i],
self.__cell,
text = i)
text=i)
self.__xports_column.append(column)
@@ -393,9 +388,9 @@ class ServicesPage(gtk.Notebook):
self.__xports_column[i].set_resizable(True)
self.__xports_column[i].set_sort_column_id(i)
self.__xports_column[i].set_attributes(self.__cell,
text = i,
background = 3,
editable = 4)
text=i,
background=3,
editable=4)
self.__xports_treeview.append_column(self.__xports_column[i])
@@ -411,7 +406,6 @@ class ServicesPage(gtk.Notebook):
if len(self.__text) > 0:
self.__select_combobox.set_active(0)
def __change_text_value(self, widget):
"""
"""
@@ -433,7 +427,6 @@ class SystemPage(BWScrolledWindow):
self.__create_widgets()
def __create_widgets(self):
"""
"""
@@ -516,7 +509,8 @@ class SystemPage(BWScrolledWindow):
sequences = self.__node.get_info('sequences')
if len(sequences) > 0:
self.__sequences_frame.bw_add(self.__create_sequences_widget(sequences))
self.__sequences_frame.bw_add(
self.__create_sequences_widget(sequences))
# operating system information widgets
self.__os = gtk.Notebook()
@@ -525,7 +519,7 @@ class SystemPage(BWScrolledWindow):
if os != None:
if os.has_key('matches'):
if 'matches' in os:
self.__match_scroll = BWScrolledWindow()
@@ -550,15 +544,15 @@ class SystemPage(BWScrolledWindow):
column = gtk.TreeViewColumn(OSMATCH_HEADER[i],
self.__cell,
text = i)
text=i)
self.__match_column.append(column)
self.__match_column[i].set_reorderable(True)
self.__match_column[i].set_resizable(True)
self.__match_column[i].set_attributes(self.__cell,
text = i,
editable = 3)
text=i,
editable=3)
self.__match_column[i].set_sort_column_id(i)
self.__match_treeview.append_column(self.__match_column[i])
@@ -567,7 +561,7 @@ class SystemPage(BWScrolledWindow):
self.__os.append_page(self.__match_scroll, BWLabel(_('Match')))
if os.has_key('classes'):
if 'classes' in os:
self.__class_scroll = BWScrolledWindow()
@@ -584,7 +578,7 @@ class SystemPage(BWScrolledWindow):
os_gen = ''
if os_class.has_key('os_gen'):
if 'os_gen' in os_class:
os_gen = os_class['os_gen']
self.__class_store.append([os_class['accuracy'],
@@ -600,15 +594,15 @@ class SystemPage(BWScrolledWindow):
column = gtk.TreeViewColumn(OSCLASS_HEADER[i],
self.__cell,
text = i)
text=i)
self.__class_column.append(column)
self.__class_column[i].set_reorderable(True)
self.__class_column[i].set_resizable(True)
self.__class_column[i].set_attributes(self.__cell,
text = i,
editable = 5)
text=i,
editable=5)
self.__class_column[i].set_sort_column_id(i)
self.__class_treeview.append_column(self.__class_column[i])
@@ -630,7 +624,7 @@ class SystemPage(BWScrolledWindow):
self.__fp_vbox = BWVBox()
if os.has_key('used_ports'):
if 'used_ports' in os:
used_ports = os['used_ports']
@@ -692,7 +686,8 @@ class SystemPage(BWScrolledWindow):
tcp_note.set_selectable(True)
tcp_note.set_line_wrap(False)
tcp_note.set_alignment(1.0, 0.5)
tcp_note.set_markup(TCP_SEQ_NOTE % (tcp['index'], tcp['difficulty']))
tcp_note.set_markup(
TCP_SEQ_NOTE % (tcp['index'], tcp['difficulty']))
table.attach(tcp_note, 0, 3, 4, 5)
@@ -733,8 +728,6 @@ class SystemPage(BWScrolledWindow):
return table
class TraceroutePage(BWVBox):
"""
"""
@@ -748,7 +741,6 @@ class TraceroutePage(BWVBox):
self.__create_widgets()
def __create_widgets(self):
"""
"""
@@ -805,23 +797,22 @@ class TraceroutePage(BWVBox):
HOP_COLOR['unknown'],
True])
self.__trace_column = list()
for i in range(len(TRACE_HEADER)):
column = gtk.TreeViewColumn(TRACE_HEADER[i],
self.__cell,
text = i)
text=i)
self.__trace_column.append(column)
self.__trace_column[i].set_reorderable(True)
self.__trace_column[i].set_resizable(True)
self.__trace_column[i].set_attributes(self.__cell,
text = i,
background = 4,
editable = 5)
text=i,
background=4,
editable=5)
self.__trace_treeview.append_column(self.__trace_column[i])