Added support for python 2 and 3

savon-noir · savon-noir · commit 9197286306af · 2014-06-18T01:58:46.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -17,12 +17,10 @@ services: mongodb
 install:
   - "pip install pep8 --use-mirrors"
   - "pip install pyflakes --use-mirrors"
-  - "pip install boto --use-mirrors"
+#  - "pip install boto --use-mirrors" # disabled: since boto not supporting py3
   - "pip install pymongo sqlalchemy MySQL-python --use-mirrors"
-  -  "pip install coveralls"
+  - "pip install coveralls"
   - "python setup.py install"
-#   - "pip install -r requirements.txt --use-mirrors"
-#     # command to run tests
 before_script:
   - "pep8 . --exclude test,docs,examples"
   - "pyflakes ."
diff --git a/README.rst b/README.rst
@@ -35,7 +35,7 @@ The lib currently offers the following modules:
 
  - mongodb: insert/get/getAll/delete
  - sqlalchemy: insert/get/getAll/delete
- - aws s3: insert/get/getAll/delete
+ - aws s3: insert/get/getAll/delete (not supported for python3 since boto is not supporting py3)
  - csv: todo (easy to implement)
  - elastic search: todo
 
@@ -57,6 +57,16 @@ Below the list of optional dependencies:
 - `pymongo`_
 - `boto`_
 
+Python Support
+--------------
+
+The libnmap code is tested against the following python interpreters:
+
+- Python 2.6
+- Python 2.7
+- Python 3.3
+- Python 3.4
+
 Install
 -------
 
diff --git a/libnmap/test/process-stressbox/check_fqp_nmap.py b/libnmap/test/process-stressbox/check_fqp_nmap.py
@@ -11,7 +11,6 @@ def do_scan(targets, options, fqp=None):
     if rc != 0:
         print("nmap scan failed: {0}".format(nm.stderr))
 
-    print(nm.stdout)
     try:
         parsed = NmapParser.parse(nm.stdout)
     except NmapParserException as e:
@@ -51,16 +50,16 @@ def print_scan(nmap_report):
 
 
 if __name__ == "__main__":
-    report = do_scan("127.0.0.1", "-sV")
-    print(report)
+    report = do_scan("127.0.0.1", "-sT")
     print_scan(report)
     # test with full path to bin
     # /usr/bin/nmap
-    report = do_scan("127.0.0.1", "-sV", fqp="/usr/bin/nmap")
+    report = do_scan("127.0.0.1", "-sT", fqp="/usr/bin/nmap")
     print_scan(report)
     # /usr/bin/lol --> will throw exception
     try:
         report = do_scan("127.0.0.1", "-sV", fqp="/usr/bin/lol")
+        print("lolbin")
         print_scan(report)
     except Exception as exc:
         print(exc)
diff --git a/libnmap/test/process-stressbox/multi_nmap_process.py b/libnmap/test/process-stressbox/multi_nmap_process.py
@@ -12,7 +12,7 @@ def start_all(nmprocs):
  
 def summarize(nmprocs):
     for nmp in nmprocs:
-        print "rc: {0} output: {1}".format(nmp.rc, len(nmp.stdout))
+        print("rc: {0} output: {1}".format(nmp.rc, len(nmp.stdout)))
 
 nm_targets = []
 for h in range(20): nm_targets.append("localhost")
diff --git a/libnmap/test/process-stressbox/multi_nmap_process_background.py b/libnmap/test/process-stressbox/multi_nmap_process_background.py
@@ -14,7 +14,7 @@ def any_running(nmprocs):
  
 def summarize(nmprocs):
   for nmp in nmprocs:
-      print "rc: {0} output: {1} stdout len: {2}".format(nmp.rc, nmp.summary, len(nmp.stdout))
+      print("rc: {0} output: {1} stdout len: {2}".format(nmp.rc, nmp.summary, len(nmp.stdout)))
 
 nm_targets = []
 for h in range(10):
@@ -25,7 +25,7 @@ def summarize(nmprocs):
 start_all_bg(nm_procs)
  
 while any_running(nm_procs):
-    print "Nmap Scan running..."
+    print("Nmap Scan running...")
     sleep(2)
  
 summarize(nm_procs)
diff --git a/libnmap/test/process-stressbox/proc_async.py b/libnmap/test/process-stressbox/proc_async.py
@@ -9,11 +9,11 @@
 while nmap_proc.is_running():
     nmaptask = nmap_proc.current_task
     if nmaptask:
-        print "Task {0} ({1}): ETC: {2} DONE: {3}%".format(nmaptask.name,
+        print("Task {0} ({1}): ETC: {2} DONE: {3}%".format(nmaptask.name,
                                                            nmaptask.status,  
                                                            nmaptask.etc,
-                                                           nmaptask.progress)
+                                                           nmaptask.progress))
     sleep(0.5)
 
-print "rc: {0} output: {1}".format(nmap_proc.rc, nmap_proc.summary)
-print nmap_proc.stdout
+print("rc: {0} output: {1}".format(nmap_proc.rc, nmap_proc.summary))
+print(nmap_proc.stdout)
diff --git a/libnmap/test/process-stressbox/stop_scan.py b/libnmap/test/process-stressbox/stop_scan.py
@@ -9,13 +9,13 @@
 while nmap_proc.is_running():
     nmaptask = nmap_proc.current_task
     if nmaptask:
-        print "Task {0} ({1}): ETC: {2} DONE: {3}%".format(nmaptask.name,
+        print("Task {0} ({1}): ETC: {2} DONE: {3}%".format(nmaptask.name,
                                                            nmaptask.status,
                                                            nmaptask.etc,
-                                                           nmaptask.progress)
+                                                           nmaptask.progress))
     sleep(3)
     nmap_proc.stop()
 
-print "rc: {0} output: {1}".format(nmap_proc.rc, nmap_proc.summary)
-print nmap_proc.stdout
-print nmap_proc.stderr
+print("rc: {0} output: {1}".format(nmap_proc.rc, nmap_proc.summary))
+print(nmap_proc.stdout)
+print(nmap_proc.stderr)
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name='python-libnmap',
-    version='0.5.2',
+    version='0.6',
     author='Ronald Bister',
     author_email='mini.pelle@gmail.com',
     packages=['libnmap', 'libnmap.plugins', 'libnmap.objects'],
