diff --git a/soup_parser.py b/includes/soup_parser.py similarity index 100% rename from soup_parser.py rename to includes/soup_parser.py diff --git a/ppf.py b/ppf.py index 7d19439..fea9154 100755 --- a/ppf.py +++ b/ppf.py @@ -7,14 +7,16 @@ import re import urllib import hashlib import ipcalc -from soup_parser import soupify from ConfigParser import SafeConfigParser from requests.packages.urllib3.exceptions import InsecureRequestWarning requests.packages.urllib3.disable_warnings(InsecureRequestWarning) +# includes sys.path.append('./includes') import mysqlite +import proxywatchd from misc import _log +from soup_parser import soupify base_header = { 'Accept-Language':'en-US,en;q=0.8', @@ -31,14 +33,8 @@ searx_instances = ('https://searx.me', 'https://searx.xyz', 'https://searx.site' retry_messages = ('Engines cannot retrieve results', 'Rate limit exceeded') proxies={'http':'socks5://127.0.0.1:9050','https':'socks5://127.0.0.1:9050'} -# include own classes -sys.path.append('./includes') -import proxywatchd, mysqlite -from misc import _log - CONFIG = 'config.ini' - def cleanhtml(raw_html): cleanr = re.compile('<.*?>') cleantext = re.sub(cleanr, ':', raw_html)