mirror of
https://github.com/nmap/nmap.git
synced 2026-01-22 14:19:02 +00:00
Merge #2088: Update Zenmap to Python 3 and PyGObject
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:
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# ***********************IMPORTANT NMAP LICENSE TERMS************************
|
||||
# * *
|
||||
@@ -188,21 +188,21 @@ if __name__ == '__main__':
|
||||
|
||||
for test, expected in TESTS:
|
||||
args_dict = parse_script_args_dict(test)
|
||||
print args_dict
|
||||
print(args_dict)
|
||||
args = parse_script_args(test)
|
||||
if args == expected:
|
||||
print "PASS", test
|
||||
print("PASS", test)
|
||||
continue
|
||||
print "FAIL", test
|
||||
print("FAIL", test)
|
||||
if args is None:
|
||||
print "Parsing error"
|
||||
print("Parsing error")
|
||||
else:
|
||||
print "%d args" % len(args)
|
||||
print("%d args" % len(args))
|
||||
for a, v in args:
|
||||
print a, "=", v
|
||||
print(a, "=", v)
|
||||
if expected is None:
|
||||
print "Expected parsing error"
|
||||
print("Expected parsing error")
|
||||
else:
|
||||
print "Expected %d args" % len(expected)
|
||||
print("Expected %d args" % len(expected))
|
||||
for a, v in expected:
|
||||
print a, "=", v
|
||||
print(a, "=", v)
|
||||
|
||||
Reference in New Issue
Block a user