PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 13:11: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

268
zenmap/zenmapGUI/ScanHostDetailsPage.py
View File

@@ -123,7 +123,8 @@
import gtk
from zenmapGUI.higwidgets.higexpanders import HIGExpander
from zenmapGUI.higwidgets.higboxes import HIGVBox, HIGHBox, hig_box_space_holder
from zenmapGUI.higwidgets.higboxes import HIGVBox, HIGHBox,\
hig_box_space_holder
from zenmapGUI.higwidgets.higlabels import HIGEntryLabel
from zenmapGUI.higwidgets.higtables import HIGTable
from zenmapGUI.Icons import get_os_logo, get_vulnerability_logo
@@ -132,6 +133,7 @@ import zenmapCore.I18N
na = _('Not available')
class ScanHostDetailsPage(HIGExpander):
def __init__(self, host):
HIGExpander.__init__(self, host.get_hostname())
@@ -139,6 +141,7 @@ class ScanHostDetailsPage(HIGExpander):
self.host_details = HostDetails(host)
self.hbox._pack_expand_fill(self.host_details)
class HostDetails(HIGVBox):
def __init__(self, host):
HIGVBox.__init__(self)
@@ -147,7 +150,8 @@ class HostDetails(HIGVBox):
self.set_os_image(get_os_logo(host))
self.set_vulnerability_image(get_vulnerability_logo(host.get_open_ports()))
self.set_vulnerability_image(
get_vulnerability_logo(host.get_open_ports()))
self.set_host_status({'state': host.get_state(),
'open': str(host.get_open_ports()),
@@ -179,16 +183,19 @@ class HostDetails(HIGVBox):
self.set_comment(host.comment)
def __create_widgets(self):
self.host_status_expander = gtk.Expander('<b>'+_('Host Status')+'</b>')
self.address_expander = gtk.Expander('<b>'+_('Addresses')+'</b>')
self.hostnames_expander = gtk.Expander('<b>'+_('Hostnames')+'</b>')
self.os_expander = gtk.Expander('<b>'+_('Operating System')+'</b>')
self.portsused_expander = gtk.Expander('<b>'+_('Ports used')+'</b>')
self.osclass_expander = gtk.Expander('<b>'+_('OS Classes')+'</b>')
self.tcp_expander = gtk.Expander('<b>'+_('TCP Sequence')+'</b>')
self.ip_expander = gtk.Expander('<b>'+_('IP ID Sequence')+'</b>')
self.tcpts_expander = gtk.Expander('<b>'+_('TCP TS Sequence')+'</b>')
self.comment_expander = gtk.Expander('<b>'+_('Comments')+'</b>')
self.host_status_expander = gtk.Expander(
'<b>' + _('Host Status') + '</b>')
self.address_expander = gtk.Expander('<b>' + _('Addresses') + '</b>')
self.hostnames_expander = gtk.Expander('<b>' + _('Hostnames') + '</b>')
self.os_expander = gtk.Expander('<b>' + _('Operating System') + '</b>')
self.portsused_expander = gtk.Expander(
'<b>' + _('Ports used') + '</b>')
self.osclass_expander = gtk.Expander('<b>' + _('OS Classes') + '</b>')
self.tcp_expander = gtk.Expander('<b>' + _('TCP Sequence') + '</b>')
self.ip_expander = gtk.Expander('<b>' + _('IP ID Sequence') + '</b>')
self.tcpts_expander = gtk.Expander(
'<b>' + _('TCP TS Sequence') + '</b>')
self.comment_expander = gtk.Expander('<b>' + _('Comments') + '</b>')
self.os_image = gtk.Image()
self.vulnerability_image = gtk.Image()
@@ -214,7 +221,6 @@ class HostDetails(HIGVBox):
self.lastboot_label = HIGEntryLabel(_('Last boot:'))
self.info_lastboot_label = HIGEntryLabel(na)
# Addresses expander
self.ipv4_label = HIGEntryLabel(_('IPv4:'))
self.info_ipv4_label = HIGEntryLabel(na)
@@ -243,63 +249,78 @@ class HostDetails(HIGVBox):
table, hbox = self.create_table_hbox()
try:
if status['state'] == '': raise Exception
if status['state'] == '':
raise Exception
self.info_host_state_label.set_text(status['state'])
except:pass
except:
pass
try:
if status['open'] == '': raise Exception
if status['open'] == '':
raise Exception
self.info_open_ports.set_text(status['open'])
except:pass
except:
pass
try:
if status['filtered'] == '': raise Exception
if status['filtered'] == '':
raise Exception
self.info_filtered_label.set_text(status['filtered'])
except:pass
except:
pass
try:
if status['closed'] == '': raise Exception
if status['closed'] == '':
raise Exception
self.info_closed_ports.set_text(status['closed'])
except:pass
except:
pass
try:
if status['scanned'] == '': raise Exception
if status['scanned'] == '':
raise Exception
self.info_scanned_label.set_text(status['scanned'])
except:pass
except:
pass
try:
if status['uptime'] == '': raise Exception
if status['uptime'] == '':
raise Exception
self.info_uptime_label.set_text(status['uptime'])
except:pass
except:
pass
try:
if status['lastboot'] == '': raise Exception
if status['lastboot'] == '':
raise Exception
self.info_lastboot_label.set_text(status['lastboot'])
except:pass
except:
pass
table.attach(self.host_state_label,0,1,0,1)
table.attach(self.info_host_state_label,1,2,0,1)
table.attach(self.host_state_label, 0, 1, 0, 1)
table.attach(self.info_host_state_label, 1, 2, 0, 1)
table.attach(self.open_label,0,1,1,2)
table.attach(self.info_open_ports,1,2,1,2)
table.attach(self.open_label, 0, 1, 1, 2)
table.attach(self.info_open_ports, 1, 2, 1, 2)
table.attach(self.filtered_label,0,1,2,3)
table.attach(self.info_filtered_label,1,2,2,3)
table.attach(self.filtered_label, 0, 1, 2, 3)
table.attach(self.info_filtered_label, 1, 2, 2, 3)
table.attach(self.closed_label,0,1,3,4)
table.attach(self.info_closed_ports,1,2,3,4)
table.attach(self.closed_label, 0, 1, 3, 4)
table.attach(self.info_closed_ports, 1, 2, 3, 4)
table.attach(self.scanned_label,0,1,4,5)
table.attach(self.info_scanned_label,1,2,4,5)
table.attach(self.scanned_label, 0, 1, 4, 5)
table.attach(self.info_scanned_label, 1, 2, 4, 5)
table.attach(self.uptime_label,0,1,5,6)
table.attach(self.info_uptime_label,1,2,5,6)
table.attach(self.uptime_label, 0, 1, 5, 6)
table.attach(self.info_uptime_label, 1, 2, 5, 6)
table.attach(self.lastboot_label,0,1,6,7)
table.attach(self.info_lastboot_label,1,2,6,7)
table.attach(self.lastboot_label, 0, 1, 6, 7)
table.attach(self.info_lastboot_label, 1, 2, 6, 7)
table.attach(self.os_image,2,4,0,3,xoptions=1,yoptions=0)
table.attach(self.vulnerability_image,2,4,4,7,xoptions=1,yoptions=0)
table.attach(self.os_image, 2, 4, 0, 3, xoptions=1, yoptions=0)
table.attach(
self.vulnerability_image, 2, 4, 4, 7, xoptions=1, yoptions=0)
table.set_col_spacing(1, 50)
@@ -307,10 +328,10 @@ class HostDetails(HIGVBox):
self._pack_noexpand_nofill(self.host_status_expander)
def set_os_image(self, image):
self.os_image.set_from_stock(image,gtk.ICON_SIZE_DIALOG)
self.os_image.set_from_stock(image, gtk.ICON_SIZE_DIALOG)
def set_vulnerability_image(self, image):
self.vulnerability_image.set_from_stock(image,gtk.ICON_SIZE_DIALOG)
self.vulnerability_image.set_from_stock(image, gtk.ICON_SIZE_DIALOG)
def set_addresses(self, address):
self.address_expander.set_use_markup(True)
@@ -319,28 +340,34 @@ class HostDetails(HIGVBox):
#print '>>> Address:', address
try:
if address['ipv4'] == 1: raise Exception
if address['ipv4'] == 1:
raise Exception
self.info_ipv4_label.set_text(address['ipv4'])
except:pass
except:
pass
try:
if address['ipv6'] == 1: raise Exception
if address['ipv6'] == 1:
raise Exception
self.info_ipv6_label.set_text(address['ipv6'])
except:pass
except:
pass
try:
if address['mac'] == 1: raise Exception
if address['mac'] == 1:
raise Exception
self.info_mac_label.set_text(address['mac'])
except:pass
except:
pass
table.attach(self.ipv4_label,0,1,0,1)
table.attach(self.info_ipv4_label,1,2,0,1)
table.attach(self.ipv4_label, 0, 1, 0, 1)
table.attach(self.info_ipv4_label, 1, 2, 0, 1)
table.attach(self.ipv6_label,0,1,1,2)
table.attach(self.info_ipv6_label,1,2,1,2)
table.attach(self.ipv6_label, 0, 1, 1, 2)
table.attach(self.info_ipv6_label, 1, 2, 1, 2)
table.attach(self.mac_label,0,1,2,3)
table.attach(self.info_mac_label,1,2,2,3)
table.attach(self.mac_label, 0, 1, 2, 3)
table.attach(self.info_mac_label, 1, 2, 2, 3)
self.address_expander.add(hbox)
self._pack_noexpand_nofill(self.address_expander)
@@ -356,17 +383,21 @@ class HostDetails(HIGVBox):
for h in hostname:
name = na
try:name = h['hostname']
except:pass
try:
name = h['hostname']
except:
pass
type = na
try:type = h['hostname_type']
except:pass
try:
type = h['hostname_type']
except:
pass
table.attach(HIGEntryLabel(_('Name - Type:')),0,1,y1,y2)
table.attach(HIGEntryLabel(name+' - '+\
type),1,2,y1,y2)
y1+=1;y2+=1
table.attach(HIGEntryLabel(_('Name - Type:')), 0, 1, y1, y2)
table.attach(HIGEntryLabel(name + ' - ' + type), 1, 2, y1, y2)
y1 += 1
y2 += 1
self.hostnames_expander.add(hbox)
self._pack_noexpand_nofill(self.hostnames_expander)
@@ -379,29 +410,34 @@ class HostDetails(HIGVBox):
progress = gtk.ProgressBar()
try:
progress.set_fraction(float(os['accuracy'])/100.0)
progress.set_text(os['accuracy']+'%')
except:progress.set_text(_('Not Available'))
progress.set_fraction(float(os['accuracy']) / 100.0)
progress.set_text(os['accuracy'] + '%')
except:
progress.set_text(_('Not Available'))
table.attach(HIGEntryLabel(_('Name:')),0,1,0,1)
table.attach(HIGEntryLabel(os['name']),1,2,0,1)
table.attach(HIGEntryLabel(_('Name:')), 0, 1, 0, 1)
table.attach(HIGEntryLabel(os['name']), 1, 2, 0, 1)
table.attach(HIGEntryLabel(_('Accuracy:')),0,1,1,2)
table.attach(progress,1,2,1,2)
table.attach(HIGEntryLabel(_('Accuracy:')), 0, 1, 1, 2)
table.attach(progress, 1, 2, 1, 2)
y1=2;y2=3
y1 = 2
y2 = 3
try:
self.set_ports_used(os['portsused'])
table.attach(self.portsused_expander,0,2,y1,y2)
y1+=1;y2+=1
except:pass
table.attach(self.portsused_expander, 0, 2, y1, y2)
y1 += 1
y2 += 1
except:
pass
try:
self.set_osclass(os['osclasses'])
self.osclass_expander.set_use_markup(True)
table.attach(self.osclass_expander,0,2,y1,y2)
except:pass
table.attach(self.osclass_expander, 0, 2, y1, y2)
except:
pass
self.os_expander.add(hbox)
self._pack_noexpand_nofill(self.os_expander)
@@ -410,13 +446,17 @@ class HostDetails(HIGVBox):
self.portsused_expander.set_use_markup(True)
table, hbox = self.create_table_hbox()
y1=0;y2=1
y1 = 0
y2 = 1
for p in ports:
table.attach(HIGEntryLabel(_('Port-Protocol-State:')),0,1,y1,y2)
table.attach(HIGEntryLabel(p['portid']+' - '+p['proto']+' - '+\
p['state']),1,2,y1,y2)
y1+=1;y2+=1
table.attach(HIGEntryLabel(
_('Port-Protocol-State:')), 0, 1, y1, y2)
table.attach(HIGEntryLabel(
p['portid'] + ' - ' + p['proto'] + ' - ' + p['state']
), 1, 2, y1, y2)
y1 += 1
y2 += 1
self.portsused_expander.add(hbox)
@@ -425,25 +465,27 @@ class HostDetails(HIGVBox):
self.osclass_expander.set_use_markup(True)
table, hbox = self.create_table_hbox()
table.attach(HIGEntryLabel(_('Type')),0,1,0,1)
table.attach(HIGEntryLabel(_('Vendor')),1,2,0,1)
table.attach(HIGEntryLabel(_('OS Family')),2,3,0,1)
table.attach(HIGEntryLabel(_('OS Generation')),3,4,0,1)
table.attach(HIGEntryLabel(_('Accuracy')),4,5,0,1)
table.attach(HIGEntryLabel(_('Type')), 0, 1, 0, 1)
table.attach(HIGEntryLabel(_('Vendor')), 1, 2, 0, 1)
table.attach(HIGEntryLabel(_('OS Family')), 2, 3, 0, 1)
table.attach(HIGEntryLabel(_('OS Generation')), 3, 4, 0, 1)
table.attach(HIGEntryLabel(_('Accuracy')), 4, 5, 0, 1)
y1=1;y2=2
y1 = 1
y2 = 2
for o in osclass:
table.attach(HIGEntryLabel(o['type']),0,1,y1,y2)
table.attach(HIGEntryLabel(o['vendor']),1,2,y1,y2)
table.attach(HIGEntryLabel(o['osfamily']),2,3,y1,y2)
table.attach(HIGEntryLabel(o['osgen']),3,4,y1,y2)
table.attach(HIGEntryLabel(o['type']), 0, 1, y1, y2)
table.attach(HIGEntryLabel(o['vendor']), 1, 2, y1, y2)
table.attach(HIGEntryLabel(o['osfamily']), 2, 3, y1, y2)
table.attach(HIGEntryLabel(o['osgen']), 3, 4, y1, y2)
progress = gtk.ProgressBar()
progress.set_text(o['accuracy']+'%')
progress.set_fraction(float(o['accuracy'])/100.0)
table.attach(progress,4,5,y1,y2)
y1+=1;y2+=1
progress.set_text(o['accuracy'] + '%')
progress.set_fraction(float(o['accuracy']) / 100.0)
table.attach(progress, 4, 5, y1, y2)
y1 += 1
y2 += 1
self.osclass_expander.add(hbox)
@@ -456,14 +498,14 @@ class HostDetails(HIGVBox):
for v in tcpseq['values'].split(','):
combo.append_text(v)
table.attach(HIGEntryLabel(_('Difficulty:')),0,1,1,2)
table.attach(HIGEntryLabel(tcpseq['difficulty']),1,2,1,2)
table.attach(HIGEntryLabel(_('Difficulty:')), 0, 1, 1, 2)
table.attach(HIGEntryLabel(tcpseq['difficulty']), 1, 2, 1, 2)
table.attach(HIGEntryLabel(_('Index:')),0,1,2,3)
table.attach(HIGEntryLabel(tcpseq['index']),1,2,2,3)
table.attach(HIGEntryLabel(_('Index:')), 0, 1, 2, 3)
table.attach(HIGEntryLabel(tcpseq['index']), 1, 2, 2, 3)
table.attach(HIGEntryLabel(_('Values:')),0,1,3,4)
table.attach(combo,1,2,3,4)
table.attach(HIGEntryLabel(_('Values:')), 0, 1, 3, 4)
table.attach(combo, 1, 2, 3, 4)
self.tcp_expander.add(hbox)
self._pack_noexpand_nofill(self.tcp_expander)
@@ -478,11 +520,11 @@ class HostDetails(HIGVBox):
for i in ipseq['values'].split(','):
combo.append_text(i)
table.attach(HIGEntryLabel(_('Class:')),0,1,0,1)
table.attach(HIGEntryLabel(ipseq['class']),1,2,0,1)
table.attach(HIGEntryLabel(_('Class:')), 0, 1, 0, 1)
table.attach(HIGEntryLabel(ipseq['class']), 1, 2, 0, 1)
table.attach(HIGEntryLabel(_('Values:')),0,1,1,2)
table.attach(combo,1,2,1,2)
table.attach(HIGEntryLabel(_('Values:')), 0, 1, 1, 2)
table.attach(combo, 1, 2, 1, 2)
self.ip_expander.add(hbox)
self._pack_noexpand_nofill(self.ip_expander)
@@ -497,11 +539,11 @@ class HostDetails(HIGVBox):
for i in tcptsseq['values'].split(','):
combo.append_text(i)
table.attach(HIGEntryLabel(_('Class:')),0,1,0,1)
table.attach(HIGEntryLabel(tcptsseq['class']),1,2,0,1)
table.attach(HIGEntryLabel(_('Class:')), 0, 1, 0, 1)
table.attach(HIGEntryLabel(tcptsseq['class']), 1, 2, 0, 1)
table.attach(HIGEntryLabel(_('Values:')),0,1,1,2)
table.attach(combo,1,2,1,2)
table.attach(HIGEntryLabel(_('Values:')), 0, 1, 1, 2)
table.attach(combo, 1, 2, 1, 2)
self.tcpts_expander.add(hbox)
self._pack_noexpand_nofill(self.tcpts_expander)
@@ -515,8 +557,8 @@ class HostDetails(HIGVBox):
self.comment_scrolled = gtk.ScrolledWindow()
self.comment_scrolled.set_border_width(5)
self.comment_scrolled.set_policy(gtk.POLICY_AUTOMATIC,\
gtk.POLICY_AUTOMATIC)
self.comment_scrolled.set_policy(
gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
self.comment_txt_vw = gtk.TextView()
self.comment_txt_vw.set_wrap_mode(gtk.WRAP_WORD)