|
@@ -12,7 +12,6 @@
|
|
|
"""
|
|
"""
|
|
|
import base64
|
|
import base64
|
|
|
|
|
|
|
|
-
|
|
|
|
|
__author__ = 'JHao'
|
|
__author__ = 'JHao'
|
|
|
|
|
|
|
|
import re
|
|
import re
|
|
@@ -285,17 +284,19 @@ class ProxyFetcher(object):
|
|
|
|
|
|
|
|
@staticmethod
|
|
@staticmethod
|
|
|
def freeProxy15():
|
|
def freeProxy15():
|
|
|
- urls=[
|
|
|
|
|
|
|
+ urls = [
|
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=#table',
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=#table',
|
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=&sort=reliability&desc=true&pnum=1#table',
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=&sort=reliability&desc=true&pnum=1#table',
|
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=&sort=reliability&desc=true&pnum=2#table',
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=&sort=reliability&desc=true&pnum=2#table',
|
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=&sort=reliability&desc=true&pnum=3#table',
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=&sort=reliability&desc=true&pnum=3#table',
|
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=&sort=reliability&desc=true&pnum=4#table',
|
|
'https://www.xroxy.com/proxylist.php?port=&type=All_http&ssl=&country=&latency=&reliability=&sort=reliability&desc=true&pnum=4#table',
|
|
|
]
|
|
]
|
|
|
|
|
+ _proxies = {'http': 'http://myhome.97admin.com:34185', 'https': 'http://myhome.97admin.com:34185'}
|
|
|
|
|
+
|
|
|
for url in urls:
|
|
for url in urls:
|
|
|
- r = WebRequest().get(url, timeout=10)
|
|
|
|
|
|
|
+ r = WebRequest().get(url, timeout=10, proxies=_proxies)
|
|
|
proxies = re.findall(
|
|
proxies = re.findall(
|
|
|
r'<td.*?>[\s\S]*?(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[\s\S]*?</td>[\s\S]*?<td.*?>[\s\S]*?(\d+)[\s\S]*?</td>',
|
|
r'<td.*?>[\s\S]*?(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[\s\S]*?</td>[\s\S]*?<td.*?>[\s\S]*?(\d+)[\s\S]*?</td>',
|
|
|
r.text)
|
|
r.text)
|
|
|
for proxy in proxies:
|
|
for proxy in proxies:
|
|
|
- yield ':'.join(proxy)
|
|
|
|
|
|
|
+ yield ':'.join(proxy)
|