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

Replace key existence tests with dict.get()

Browse Source 
Replaced instances of this pattern:

if 'key' in somedict:
    var = somedict['key']
else:
    var = ""

...with this much simpler pattern:

var = somedict.get('key', "")

Some variations, like returning None if the key is not found were also
replaced.
This commit is contained in:
dmiller
2014-01-08 20:28:12 +00:00
parent 5c662fffdc
commit b254234118
5 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,17 +254,9 @@ class ServicesPage(gtk.Notebook):
color = get_service_color(port['state']['state'])
if 'name' in port['service']:
service_name = port['service']['name']
service_name = port['service'].get('name', _('<unknown>'))
else:
service_name = _('<unknown>')
if 'method' in port['service']:
service_method = port['service']['method']
else:
service_method = _('<none>')
service_method = port['service'].get('method', _('<none>'))
reference = self.__ports_store.append(None,
[port['id'],
@@ -576,10 +568,7 @@ class SystemPage(BWScrolledWindow):
for os_class in os['classes']:
os_gen = ''
if 'os_gen' in os_class:
os_gen = os_class['os_gen']
os_gen = os_class.get('os_gen', '')
self.__class_store.append([os_class['accuracy'],
os_class['vendor'],