From 915d8328c07317cf5eb7c186ce246e2bb41bd05e Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Tue, 25 Feb 2020 12:30:43 +0100
Subject: [PATCH] Use print() function in Python 2 and Python 3

---
 python_ruby_and_bash/http_sniffer.py   |  9 +++++----
 python_ruby_and_bash/python_sniffer.py |  3 ++-
 python_ruby_and_bash/scapscan.py       | 13 +++++++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/python_ruby_and_bash/http_sniffer.py b/python_ruby_and_bash/http_sniffer.py
index 7e2aa7e..126c94e 100644
--- a/python_ruby_and_bash/http_sniffer.py
+++ b/python_ruby_and_bash/http_sniffer.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+from __future__ import print_function
 import socket
 
 s=socket.socket(socket.PF_PACKET, socket.SOCK_RAW, socket.ntohs(0x0800))
@@ -8,14 +9,14 @@ while True:
  data=s.recvfrom(65565)
  try:
   if "HTTP" in data[0][54:]:
-    print "[","="*30,']'
+    print("[","="*30,']')
     raw=data[0][54:]
     if "\r\n\r\n" in raw:
      line=raw.split('\r\n\r\n')[0]
-     print "[*] Header Captured "
-     print line[line.find('HTTP'):]
+     print("[*] Header Captured ")
+     print(line[line.find('HTTP'):])
     else:
-     print raw
+     print(raw)
   else:
    #print '[{}]'.format(data)
    pass
diff --git a/python_ruby_and_bash/python_sniffer.py b/python_ruby_and_bash/python_sniffer.py
index 96eed61..0017b45 100644
--- a/python_ruby_and_bash/python_sniffer.py
+++ b/python_ruby_and_bash/python_sniffer.py
@@ -5,6 +5,7 @@
 # snifffer (packet capture script) using python.
 #####################################################################
 
+from __future__ import print_function
 import socket
  
 #create an INET, raw socket
@@ -14,4 +15,4 @@ s = socket.socket(socket.AF_INET, socket.SOCK_RAW, socket.IPPROTO_TCP)
 while True:
 
    # print output on terminal
-   print s.recvfrom(65565)
+   print(s.recvfrom(65565))
diff --git a/python_ruby_and_bash/scapscan.py b/python_ruby_and_bash/scapscan.py
index 7a3ff2a..44cfb73 100644
--- a/python_ruby_and_bash/scapscan.py
+++ b/python_ruby_and_bash/scapscan.py
@@ -5,6 +5,7 @@ version 1.0
 This is a quick demonstration on how to use the scapy as a scanner
 * Pre-requisite: scapy, prettytable, argparse
 """
+from __future__ import print_function
 
 import sys
 import prettytable
@@ -148,8 +149,8 @@ def start(your_target,your_ports,your_timeout):
     port_list = your_ports
     user_dst_timeout = your_timeout
 
-    print "[+] Target : %s\n" % user_dst_ip
-    print "[*] Scan started\n"
+    print("[+] Target : %s\n" % user_dst_ip)
+    print("[*] Scan started\n")
 
     for i in port_list:
         tcp_connect_scan_res = tcp_connect_scan(user_dst_ip,int(i),int(user_dst_timeout))
@@ -161,9 +162,9 @@ def start(your_target,your_ports,your_timeout):
         window_scan_res = window_scan(user_dst_ip,int(i),int(user_dst_timeout))
         udp_scan_res = udp_scan(user_dst_ip,int(i),int(user_dst_timeout))
         x.add_row([i,tcp_connect_scan_res,stealth_scan_res,xmas_scan_res,fin_scan_res,null_scan_res,ack_flag_scan_res,window_scan_res,udp_scan_res])
-    print x
+    print(x)
 
-    print "\n[*] Scan completed\n"
+    print("\n[*] Scan completed\n")
 
 
 def banner():
@@ -184,7 +185,7 @@ usage: scapy_stealth_scan.py [-h] [-p] [-pl] [-pr] [-t] target
 
 ************************************************************
    	"""
-    print bannerTxt
+    print(bannerTxt)
 
 
 def main():
@@ -215,7 +216,7 @@ def main():
     timeout = int( args.t)
 
     if(not len(ports)>0):
-            print "No ports specified.\nUse -h or --help to see the help menu"
+            print("No ports specified.\nUse -h or --help to see the help menu")
             exit(0)
 
     ports = list(set(ports))