Adjust whitespace and set bytes to str for Python 2

Author: zeroSteiner

data/meterpreter/meterpreter.py

@@ -16,6 +16,9 @@
 import sys
 import threading
 
+if sys.version_info[0] < 3:
+	bytes = str
+
 #
 # Constants
 #
@@ -286,7 +289,7 @@ def run(self):
 					break
 				req_length, req_type = struct.unpack('>II', request)
 				req_length -= 8
-				request = ''
+				request = bytes()
 				while len(request) < req_length:
 					request += self.socket.recv(4096)
 				response = self.create_response(request)
@@ -487,7 +490,7 @@ def create_response(self, request):
 			try:
 				#print("[*] running method {0}".format(handler_name))
 				result, resp = handler(request, resp)
-			except Exception, err:
+			except Exception:
 				#print("[-] method {0} resulted in an error".format(handler_name))
 				result = ERROR_FAILURE
 		else:

modules/payloads/stagers/python/bind_tcp.rb

@@ -22,7 +22,7 @@ def initialize(info = {})
       'Arch'          => ARCH_PYTHON,
       'Handler'       => Msf::Handler::BindTcp,
       'Stager'        => {'Payload' => ""}
-      ))
+    ))
   end
 
   #

modules/payloads/stagers/python/reverse_tcp.rb

@@ -22,7 +22,7 @@ def initialize(info = {})
       'Arch'          => ARCH_PYTHON,
       'Handler'       => Msf::Handler::ReverseTcp,
       'Stager'        => {'Payload' => ""}
-      ))
+    ))
   end
 
   #

modules/payloads/stages/python/meterpreter.rb

@@ -20,7 +20,8 @@ def initialize(info = {})
       'Platform'      => 'python',
       'Arch'          => ARCH_PYTHON,
       'License'       => MSF_LICENSE,
-      'Session'       => Msf::Sessions::Meterpreter_Python_Python))
+      'Session'       => Msf::Sessions::Meterpreter_Python_Python
+    ))
   end
 
   def generate_stage