Modifications for compiling on Python3

Some modifications made for compiling on Python3.
- print statements transformed to functions
- on requestProxy.py on line 86, the + for items() replaced with
update(), as the '+' is no longer available on Python3. The update()
works both for Python2 and Python3.

Author: christinabo

http_request_randomizer/requests/proxy/requestProxy.py

@@ -83,7 +83,11 @@ def randomize_proxy(self):
     def generate_proxied_request(self, url, method="GET", params={}, data={}, headers={}, req_timeout=30):
         try:
             random.shuffle(self.proxy_list)
-            req_headers = dict(params.items() + self.generate_random_request_headers().items())
+            # req_headers = dict(params.items() + self.generate_random_request_headers().items())
+
+            req_headers = dict(params.items())
+            req_headers_random = dict(self.generate_random_request_headers().items())
+            req_headers.update(req_headers_random)
 
             if not self.sustain:
                 self.randomize_proxy()
@@ -100,7 +104,7 @@ def generate_proxied_request(self, url, method="GET", params={}, data={}, header
                 raise ConnectionError("HTTP Response [403] - Permission denied error")
             elif request.status_code == 503:
                 raise ConnectionError("HTTP Response [503] - Service unavailable error")
-            print 'RR Status {}'.format(request.status_code)
+            print('RR Status {}'.format(request.status_code))
             return request
         except ConnectionError:
             try:
@@ -132,19 +136,19 @@ def generate_proxied_request(self, url, method="GET", params={}, data={}, header
 
     start = time.time()
     req_proxy = RequestProxy()
-    print "Initialization took: {0} sec".format((time.time() - start))
-    print "Size : ", len(req_proxy.get_proxy_list())
-    print " ALL = ", req_proxy.get_proxy_list()
+    print("Initialization took: {0} sec".format((time.time() - start)))
+    print("Size: {0}".format(len(req_proxy.get_proxy_list())))
+    print("ALL = {0} ".format(req_proxy.get_proxy_list()))
 
     test_url = 'http://ipv4.icanhazip.com'
 
     while True:
         start = time.time()
         request = req_proxy.generate_proxied_request(test_url)
-        print "Proxied Request Took: {0} sec => Status: {1}".format((time.time() - start), request.__str__())
+        print("Proxied Request Took: {0} sec => Status: {1}".format((time.time() - start), request.__str__()))
         if request is not None:
-            print "\t Response: ip={0}".format(u''.join(request.text).encode('utf-8'))
-        print "Proxy List Size: ", len(req_proxy.get_proxy_list())
+            print("\t Response: ip={0}".format(u''.join(request.text).encode('utf-8')))
+        print("Proxy List Size: {0}".format(len(req_proxy.get_proxy_list())))
 
-        print"-> Going to sleep.."
+        print("-> Going to sleep..")
         time.sleep(10)

http_request_randomizer/requests/useragent/userAgent.py

@@ -40,8 +40,8 @@ def get_len_user_agent(self):
 
 if __name__ == '__main__':
     ua = UserAgentManager()
-    print "Number of User Agent headers: " + str(ua.get_len_user_agent)
-    print "First User Agent in file: " + ua.get_first_user_agent()
-    print "Last User Agent in file: " + ua.get_last_user_agent()
-    print "If you want one random header for a request, you may use the following header:\n"
-    print "User-Agent: " + ua.get_random_user_agent() + "\n"
+    print("Number of User Agent headers: {0}".format(str(ua.get_len_user_agent)))
+    print("First User Agent in file: {0}".format(ua.get_first_user_agent()))
+    print("Last User Agent in file: {0}".format(ua.get_last_user_agent()))
+    print("If you want one random header for a request, you may use the following header:\n")
+    print("User-Agent: " + ua.get_random_user_agent() + "\n")