Merge branch 'hotfix/1.2.2'

Author: pgaref

README.md

@@ -68,7 +68,7 @@ Specify output stream (default: sys.stdout), could also be a file:
 ```
 specify provider timeout threshold in seconds:
 ```
--t, --timeout
+  -t, --timeout
 ```
 specify proxy bandwidth threshold in KBs:
 ```                        

README.rst

@@ -100,7 +100,7 @@ specify provider timeout threshold in seconds:
 
 ::
 
-    -t, --timeout
+      -t, --timeout
 
 specify proxy bandwidth threshold in KBs:
 

http_request_randomizer/requests/parsers/FreeProxyParser.py

@@ -19,7 +19,7 @@ def parse_proxyList(self):
         try:
             response = requests.get(self.get_url(), timeout=self.timeout)
             if not response.ok:
-                logger.warn("Proxy Provider url failed: {}".format(self.get_url()))
+                logger.warning("Proxy Provider url failed: {}".format(self.get_url()))
                 return []
 
             content = response.content

http_request_randomizer/requests/parsers/ProxyForEuParser.py

@@ -20,7 +20,7 @@ def parse_proxyList(self):
             response = requests.get(self.get_url(), timeout=self.timeout)
 
             if not response.ok:
-                logger.warn("Proxy Provider url failed: {}".format(self.get_url()))
+                logger.warning("Proxy Provider url failed: {}".format(self.get_url()))
                 return []
 
             content = response.content

http_request_randomizer/requests/parsers/RebroWeeblyParser.py

@@ -22,7 +22,7 @@ def parse_proxyList(self, use_top15k=False):
             response = requests.get(self.get_url() + "/" + self.top_proxy_path, timeout=self.timeout)
 
             if not response.ok:
-                logger.warn("Proxy Provider url failed: {}".format(self.get_url()))
+                logger.warning("Proxy Provider url failed: {}".format(self.get_url()))
                 return []
 
             content = response.content

http_request_randomizer/requests/parsers/SamairProxyParser.py

@@ -28,7 +28,7 @@ def parse_proxyList(self):
                 if not response.ok:
                     # Could not parse ANY page - Let user know
                     if not curr_proxy_list:
-                        logger.warn("Proxy Provider url failed: {}".format(self.get_url()))
+                        logger.warning("Proxy Provider url failed: {}".format(self.get_url()))
                     # Return proxies parsed so far
                     return curr_proxy_list
                 content = response.content
@@ -73,7 +73,7 @@ def get_pagination_set(self):
         page_set = set()
         # Could not parse pagination page - Let user know
         if not response.ok:
-            logger.warn("Proxy Provider url failed: {}".format(self.get_url()))
+            logger.warning("Proxy Provider url failed: {}".format(self.get_url()))
             return page_set
         content = response.content
         soup = BeautifulSoup(content, "html.parser")

http_request_randomizer/requests/proxy/requestProxy.py

@@ -56,7 +56,7 @@ def __init__(self, web_proxy_list=[], sustain=False, timeout=5):
             try:
                 self.proxy_list += parsers[i].parse_proxyList()
             except ReadTimeout:
-                self.logger.warn("Proxy Parser: '{}' TimedOut!".format(parsers[i].url))
+                self.logger.warning("Proxy Parser: '{}' TimedOut!".format(parsers[i].url))
         self.current_proxy = self.randomize_proxy()
 
     def set_logger_level(self, level):

http_request_randomizer/requests/runners/proxyList.py

@@ -2,7 +2,6 @@
 import logging
 import sys
 
-import os
 import pkg_resources
 
 from http_request_randomizer.requests.parsers.FreeProxyParser import FreeProxyParser

requirements.txt

@@ -1,8 +1,8 @@
 beautifulsoup4 >= 4.6.0
-coverage >= 4.4.2
+coverage >= 4.5.1
 httmock >= 1.2.6
 psutil >= 5.4.3
-pytest >= 3.3.2
+pytest >= 3.4.0
 pytest-cov >= 2.5.1
 python-dateutil >= 2.6.1
 requests >= 2.18.4

setup.py

@@ -47,7 +47,7 @@ def run_tests(self):
 
 setup(
     name='http_request_randomizer',
-    version='1.2.1',
+    version='1.2.2',
     url='http://pgaref.com/blog/python-proxy',
     license='MIT',
     author='Panagiotis Garefalakis',