Merge branch 'hotfix/1.0.6'

Fixing SamairProxy failing tests & Updating dependencies & Bumping up PyPi version

Author: pgaref

http_request_randomizer/requests/proxy/requestProxy.py

@@ -99,7 +99,7 @@ def generate_proxied_request(self, url, method="GET", params={}, data={}, header
 
             self.logger.debug("Using proxy: {0}".format(str(self.current_proxy)))
             request = requests.request(method, url, proxies={"http": self.current_proxy},
-                                       headers=headers, data=data, params=params, timeout=req_timeout, allow_redirects=False)
+                                       headers=headers, data=data, params=params, timeout=req_timeoutg)
             # Avoid HTTP request errors
             if request.status_code == 409:
                 raise ConnectionError("HTTP Response [409] - Possible Cloudflare DNS resolution error")

requirements.txt

@@ -2,9 +2,9 @@ beautifulsoup4 == 4.6.0
 coverage == 4.4.1
 httmock == 1.2.6
 psutil == 5.2.2
-pytest == 3.0.7
+pytest == 3.1.3
 pytest-cov == 2.5.1
 python-dateutil == 2.6.0
-requests == 2.14.2
-schedule == 0.4.2
-pyOpenSSL == 17.0.0
+requests == 2.18.1
+schedule == 0.4.3
+pyOpenSSL == 17.1.0

setup.py

@@ -47,7 +47,7 @@ def run_tests(self):
 
 setup(
     name='http_request_randomizer',
-    version='1.0.5',
+    version='1.0.6',
     url='http://pgaref.com/blog/python-proxy',
     license='MIT',
     author='Panagiotis Garefalakis',
@@ -65,8 +65,8 @@ def run_tests(self):
                       'httmock >= 1.2.6',
                       'psutil >= 5.2.2',
                       'python-dateutil >= 2.6.0',
-                      'requests >= 2.14.2',
-                      'schedule >= 0.4.2',
+                      'requests >= 2.18.1',
+                      'schedule >= 0.4.3',
                       ],
     setup_requires=['pytest-runner'],
     zip_safe=False,

tests/mocks.py

@@ -126,7 +126,7 @@ def rebro_weebly_mock(url, request):
 
 @urlmatch(netloc=r'(.*\.)?www.samair.ru')
 def samair_mock(url, request):
-    return """<table id="proxylist">\n
+    return """<div id="proxylist">\n
     <tr class="list_sorted">\n
         <th><a href="http://samair.ru/proxy/ip-address-01.htm"
                title="Proxy List sorted by ip address">IP address</a></th>
@@ -166,4 +166,4 @@ def samair_mock(url, request):
         <td>OVH Hosting</td>
     </tr>
     \n
-</table>"""
+</div>"""