PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-08 05:31:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge #2088: Update Zenmap to Python 3 and PyGObject

Browse Source 
Note: Ndiff build will be broken until subsequent changes are made.
Deprecation warnings will need to be addressed in future changes.
Closes #2088
This commit is contained in:
dmiller
2022-12-07 20:34:03 +00:00
parent e2e55660c3
commit 24b26317c7
104 changed files with 5381 additions and 4383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zenmap/zenmapCore/NmapOptions.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
# This is an Nmap command line parser. It has two main parts:
#
@@ -539,7 +539,7 @@ class NmapOptions(object):
return self.d.setdefault(self.canonicalize_name(key), default)
def handle_result(self, result):
if isinstance(result, basestring):
if isinstance(result, str):
# A positional argument.
self.target_specs.append(result)
return
@@ -640,7 +640,7 @@ class NmapOptions(object):
self["-d"] = int(arg)
except ValueError:
if reduce(lambda x, y: x and y,
map(lambda z: z == "d", arg), True):
[z == "d" for z in arg], True):
self.setdefault("-d", 0)
self["-d"] += len(arg) + 1
else:
@@ -720,7 +720,7 @@ class NmapOptions(object):
self["-v"] = -1
except ValueError:
if reduce(lambda x, y: x and y,
map(lambda z: z == "v", arg), True):
[z == "v" for z in arg], True):
self.setdefault("-v", 0)
self["-v"] += len(arg) + 1
else:
@@ -763,7 +763,7 @@ class NmapOptions(object):
opt_list.append("-T%s" % str(self["-T"]))
if self["-O"] is not None:
if isinstance(self["-O"], basestring):
if isinstance(self["-O"], str):
opt_list.append("-O%s" % self["-O"])
elif self["-O"]:
opt_list.append("-O")
@@ -815,7 +815,7 @@ class NmapOptions(object):
if self[ping_option] is not None:
opt_list.append(ping_option + self[ping_option])
if self["-PB"] is not None:
if isinstance(self["-PB"], basestring):
if isinstance(self["-PB"], str):
opt_list.append("-PB" + self["-PB"])
elif self["-PB"]:
opt_list.append("-PB")