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

75
zenmap/zenmapGUI/ScanOpenPortsPage.py
View File

@@ -128,12 +128,14 @@ from zenmapGUI.higwidgets.higtables import HIGTable
from zenmapCore.UmitLogging import log
import zenmapCore.I18N
def findout_service_icon(port_info):
if port_info["port_state"] in ["open", "open|filtered"]:
return gtk.STOCK_YES
else:
return gtk.STOCK_NO
def get_version_string(d):
"""Get a human-readable version string from the dict d. The keys used in d
are "service_product", "service_version", and "service_extrainfo" (all are
@@ -148,38 +150,45 @@ def get_version_string(d):
result.append("(" + d["service_extrainfo"] + ")")
return " ".join(result)
def get_addrs(host):
if host is None:
return None
return host.get_addrs_for_sort()
def cmp_addrs(host_a, host_b):
return cmp(get_addrs(host_a), get_addrs(host_b))
def cmp_port_list_addr(model, iter_a, iter_b):
host_a = model.get_value(iter_a, 0)
host_b = model.get_value(iter_b, 0)
return cmp_addrs(host_a, host_b)
def cmp_port_tree_addr(model, iter_a, iter_b):
host_a = model.get_value(iter_a, 0)
host_b = model.get_value(iter_b, 0)
return cmp_addrs(host_a, host_b)
def cmp_host_list_addr(model, iter_a, iter_b):
host_a = model.get_value(iter_a, 2)
host_b = model.get_value(iter_b, 2)
return cmp_addrs(host_a, host_b)
def cmp_host_tree_addr(model, iter_a, iter_b):
host_a = model.get_value(iter_a, 2)
host_b = model.get_value(iter_b, 2)
return cmp_addrs(host_a, host_b)
class ScanOpenPortsPage(gtk.ScrolledWindow):
def __init__(self):
gtk.ScrolledWindow.__init__(self)
self.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC)
self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
self.__create_widgets()
@@ -188,6 +197,7 @@ class ScanOpenPortsPage(gtk.ScrolledWindow):
def __create_widgets(self):
self.host = HostOpenPorts()
class HostOpenPorts(HIGVBox):
def __init__(self):
HIGVBox.__init__(self)
@@ -203,8 +213,10 @@ class HostOpenPorts(HIGVBox):
# host hostname icon port protocol state service version
# The hostname column is shown only when more than one host is selected
# (hence port_tree not port_list is used).
self.port_list = gtk.ListStore(object, str, str, int, str, str, str, str)
self.port_tree = gtk.TreeStore(object, str, str, int, str, str, str, str)
self.port_list = gtk.ListStore(
object, str, str, int, str, str, str, str)
self.port_tree = gtk.TreeStore(
object, str, str, int, str, str, str, str)
self.port_list.set_sort_func(1000, cmp_port_list_addr)
self.port_list.set_sort_column_id(1000, gtk.SORT_ASCENDING)
@@ -229,8 +241,10 @@ class HostOpenPorts(HIGVBox):
# service icon host hostname port protocol state version
# service is shown only when more than one service is selected (hence
# host_tree not host_list is used).
self.host_list = gtk.ListStore(str, str, object, str, int, str, str, str)
self.host_tree = gtk.TreeStore(str, str, object, str, int, str, str, str)
self.host_list = gtk.ListStore(
str, str, object, str, int, str, str, str)
self.host_tree = gtk.TreeStore(
str, str, object, str, int, str, str, str)
self.host_list.set_sort_func(1000, cmp_host_list_addr)
self.host_list.set_sort_column_id(1000, gtk.SORT_ASCENDING)
@@ -285,7 +299,8 @@ class HostOpenPorts(HIGVBox):
self.host_columns['state'].pack_start(self.cell_port, True)
self.host_columns['service'].set_attributes(self.cell_port, text=0)
self.host_columns['icon'].set_attributes(self.cell_host_icon, stock_id=1)
self.host_columns['icon'].set_attributes(
self.cell_host_icon, stock_id=1)
self.host_columns['hostname'].set_attributes(self.cell_port, text=3)
self.host_columns['port_number'].set_attributes(self.cell_port, text=4)
self.host_columns['protocol'].set_attributes(self.cell_port, text=5)
@@ -294,7 +309,8 @@ class HostOpenPorts(HIGVBox):
self.host_columns['service'].set_visible(False)
self.scroll_ports_hosts.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
self.scroll_ports_hosts.set_policy(
gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
def _set_port_list(self):
self.port_view.set_enable_search(True)
@@ -315,7 +331,6 @@ class HostOpenPorts(HIGVBox):
self.port_columns[k].set_reorderable(True)
self.port_columns[k].set_resizable(True)
self.port_columns['icon'].set_min_width(35)
self.port_columns['hostname'].set_sort_column_id(1000)
@@ -368,10 +383,14 @@ class HostOpenPorts(HIGVBox):
def freeze(self):
"""Freeze notifications and sorting to make adding lots of elements to
the model faster."""
self.frozen_host_list_sort_column_id = self.host_list.get_sort_column_id()
self.frozen_host_tree_sort_column_id = self.host_tree.get_sort_column_id()
self.frozen_port_list_sort_column_id = self.port_list.get_sort_column_id()
self.frozen_port_tree_sort_column_id = self.port_tree.get_sort_column_id()
self.frozen_host_list_sort_column_id = \
self.host_list.get_sort_column_id()
self.frozen_host_tree_sort_column_id = \
self.host_tree.get_sort_column_id()
self.frozen_port_list_sort_column_id = \
self.port_list.get_sort_column_id()
self.frozen_port_tree_sort_column_id = \
self.port_tree.get_sort_column_id()
self.host_list.set_default_sort_func(lambda *args: -1)
self.host_tree.set_default_sort_func(lambda *args: -1)
self.port_list.set_default_sort_func(lambda *args: -1)
@@ -387,13 +406,17 @@ class HostOpenPorts(HIGVBox):
"""Restore notifications and sorting (after making changes to the
model)."""
if self.frozen_host_list_sort_column_id != (None, None):
self.host_list.set_sort_column_id(*self.frozen_host_list_sort_column_id)
self.host_list.set_sort_column_id(
*self.frozen_host_list_sort_column_id)
if self.frozen_host_tree_sort_column_id != (None, None):
self.host_tree.set_sort_column_id(*self.frozen_host_tree_sort_column_id)
self.host_tree.set_sort_column_id(
*self.frozen_host_tree_sort_column_id)
if self.frozen_port_list_sort_column_id != (None, None):
self.port_list.set_sort_column_id(*self.frozen_port_list_sort_column_id)
self.port_list.set_sort_column_id(
*self.frozen_port_list_sort_column_id)
if self.frozen_port_tree_sort_column_id != (None, None):
self.port_tree.set_sort_column_id(*self.frozen_port_tree_sort_column_id)
self.port_tree.set_sort_column_id(
*self.frozen_port_tree_sort_column_id)
self.host_view.set_model(self.frozen_host_view_model)
self.port_view.set_model(self.frozen_port_view_model)
self.host_view.thaw_child_notify()
@@ -414,7 +437,8 @@ class HostOpenPorts(HIGVBox):
self.host_list.append(entry)
def add_to_port_tree(self, host):
parent = self.port_tree.append(None, [host, host.get_hostname(), None, 0,'','','',''])
parent = self.port_tree.append(
None, [host, host.get_hostname(), None, 0, '', '', '', ''])
for p in host.get_ports():
self.port_tree.append(parent,
[None, '', findout_service_icon(p), int(p.get('portid', "0")),
@@ -422,12 +446,21 @@ class HostOpenPorts(HIGVBox):
p.get('service_name', _("Unknown")), get_version_string(p)])
def add_to_host_tree(self, service_name, ports):
parent = self.host_tree.append(None, [service_name, '', None, '', 0, '', '', ''])
parent = self.host_tree.append(
None, [service_name, '', None, '', 0, '', '', ''])
for p in ports:
self.host_tree.append(parent,
['', findout_service_icon(p), p["host"], p["host"].get_hostname(),
int(p.get('portid', "0")), p.get('protocol', ""),
p.get('port_state', _("Unknown")), get_version_string(p)])
[
'',
findout_service_icon(p),
p["host"],
p["host"].get_hostname(),
int(p.get('portid', "0")),
p.get('protocol', ""),
p.get('port_state', _("Unknown")),
get_version_string(p)
]
)
def switch_port_to_list_store(self):
if self.port_view.get_model() != self.port_list: