Skip to content

Commit 25eced8

Browse files
savon-noirsavon-noir
committed
add support for python3: testing
1 parent b237a8a commit 25eced8

41 files changed

Lines changed: 168 additions & 101 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,5 @@ nosetests.xml
3939
.project
4040
.pydevproject
4141
.swp
42+
43+
__pycache__

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ python:
33
# - "2.5" Not needed EL can use epel to upgrade to 2.6
44
- "2.6"
55
- "2.7"
6-
# - "3.2" Not ready yet
6+
- "3.3"
7+
- "3.4"
78
# command to install dependencies
89
env:
910
# - MONGO_VERSION=1.2.12

‎MANIFEST‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ docs/objects.rst
1010
docs/parser.rst
1111
docs/plugins_s3.rst
1212
docs/process.rst
13+
docs/objects/cpe.rst
14+
docs/objects/nmaphost.rst
15+
docs/objects/nmapreport.rst
16+
docs/objects/nmapservice.rst
17+
docs/objects/os.rst
1318
libnmap/__init__.py
1419
libnmap/diff.py
1520
libnmap/parser.py

‎examples/check_cpe.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
23

34
from libnmap.parser import NmapParser
45

@@ -13,15 +14,15 @@
1314

1415
# get CPE from service if available
1516
for s in _host.services:
16-
print " Service: {0}/{1} ({2})".format(s.port,
17+
print(" Service: {0}/{1} ({2})".format(s.port,
1718
s.protocol,
18-
s.state)
19+
s.state))
1920
# NmapService.cpelist returns an array of CPE objects
2021
for _serv_cpe in s.cpelist:
21-
print " CPE: {0}".format(_serv_cpe.cpestring)
22+
print(" CPE: {0}".format(_serv_cpe.cpestring))
2223

2324
if _host.os_fingerprinted:
24-
print " OS Fingerprints"
25+
print(" OS Fingerprints")
2526
for osm in _host.os.osmatches:
2627
print(" Found Match:{0} ({1}%)".format(osm.name,
2728
osm.accuracy))

‎examples/diff_sample1.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
23

34
from libnmap.parser import NmapParser
45

@@ -18,11 +19,11 @@
1819
service1_items_changed = changed_service1.diff(changed_service2).changed()
1920

2021
for diff_attr in service1_items_changed:
21-
print "diff({0}, {1}) [{2}:{3}] [{4}:{5}]".format(changed_service1.id,
22+
print("diff({0}, {1}) [{2}:{3}] [{4}:{5}]".format(changed_service1.id,
2223
changed_service2.id,
2324
diff_attr,
2425
getattr(changed_service1,
2526
diff_attr),
2627
diff_attr,
2728
getattr(changed_service2,
28-
diff_attr))
29+
diff_attr)))

‎examples/diff_sample2.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
23

34
from libnmap.parser import NmapParser
45

@@ -19,9 +20,9 @@ def print_diff_added(obj1, obj2, added):
1920
subobj1 = obj1.get_host_byid(nested[1])
2021
elif nested[0] == 'NmapService':
2122
subobj1 = obj1.get_service_byid(nested[1])
22-
print "+ {0}".format(subobj1)
23+
print("+ {0}".format(subobj1))
2324
else:
24-
print "+ {0} {1}: {2}".format(obj1, akey, getattr(obj1, akey))
25+
print("+ {0} {1}: {2}".format(obj1, akey, getattr(obj1, akey)))
2526

2627

2728
def print_diff_removed(obj1, obj2, removed):
@@ -32,9 +33,9 @@ def print_diff_removed(obj1, obj2, removed):
3233
subobj2 = obj2.get_host_byid(nested[1])
3334
elif nested[0] == 'NmapService':
3435
subobj2 = obj2.get_service_byid(nested[1])
35-
print "- {0}".format(subobj2)
36+
print("- {0}".format(subobj2))
3637
else:
37-
print "- {0} {1}: {2}".format(obj2, rkey, getattr(obj2, rkey))
38+
print("- {0} {1}: {2}".format(obj2, rkey, getattr(obj2, rkey)))
3839

3940

4041
def print_diff_changed(obj1, obj2, changes):
@@ -49,9 +50,9 @@ def print_diff_changed(obj1, obj2, changes):
4950
subobj2 = obj2.get_service_byid(nested[1])
5051
print_diff(subobj1, subobj2)
5152
else:
52-
print "~ {0} {1}: {2} => {3}".format(obj1, mkey,
53+
print("~ {0} {1}: {2} => {3}".format(obj1, mkey,
5354
getattr(obj2, mkey),
54-
getattr(obj1, mkey))
55+
getattr(obj1, mkey)))
5556

5657

5758
def print_diff(obj1, obj2):

‎examples/json_serialize.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
3+
14
from libnmap.parser import NmapParser
25
from libnmap.reportjson import ReportDecoder, ReportEncoder
36
import json
@@ -6,8 +9,7 @@
69

710
# create a json object from an NmapReport instance
811
nmap_report_json = json.dumps(nmap_report_obj, cls=ReportEncoder)
9-
print nmap_report_json
12+
print(nmap_report_json)
1013
# create a NmapReport instance from a json object
1114
nmap_report_obj = json.loads(nmap_report_json, cls=ReportDecoder)
12-
print nmap_report_obj
13-
15+
print(nmap_report_obj)

‎examples/nmap_task.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
23

34
from libnmap.process import NmapProcess
45

6+
57
def mycallback(nmaptask):
68
nmaptask = nmap_proc.current_task
79
if nmaptask:
8-
print "Task {0} ({1}): ETC: {2} DONE: {3}%".format(nmaptask.name,
10+
print("Task {0} ({1}): ETC: {2} DONE: {3}%".format(nmaptask.name,
911
nmaptask.status,
1012
nmaptask.etc,
11-
nmaptask.progress)
13+
nmaptask.progress))
1214

1315
nmap_proc = NmapProcess(targets="scanme.nmap.org",
1416
options="-sV",
1517
event_callback=mycallback)
1618
nmap_proc.run()
17-
print nmap_proc.stdout
18-
print nmap_proc.stderr
19+
print(nmap_proc.stdout)
20+
print(nmap_proc.stderr)

‎examples/nmap_task_bg.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
23

34
from libnmap.process import NmapProcess
45

@@ -7,10 +8,10 @@
78
while nmap_proc.is_running():
89
nmaptask = nmap_proc.current_task
910
if nmaptask:
10-
print "Task {0} ({1}): ETC: {2} DONE: {3}%".format(nmaptask.name,
11+
print("Task {0} ({1}): ETC: {2} DONE: {3}%".format(nmaptask.name,
1112
nmaptask.status,
1213
nmaptask.etc,
13-
nmaptask.progress)
14-
print "rc: {0} output: {1}".format(nmap_proc.rc, nmap_proc.summary)
15-
print nmap_proc.stdout
16-
print nmap_proc.stderr
14+
nmaptask.progress))
15+
print("rc: {0} output: {1}".format(nmap_proc.rc, nmap_proc.summary))
16+
print(nmap_proc.stdout)
17+
print(nmap_proc.stderr)

‎examples/os_fingerprint.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
23

34
from libnmap.parser import NmapParser
45

@@ -18,4 +19,4 @@
1819
for cpe in osc.cpelist:
1920
print("\tCPE: {0}".format(cpe.cpestring))
2021
else:
21-
print "No fingerprint available"
22+
print("No fingerprint available")

0 commit comments

Comments
 (0)