ppf: properly reraise keyboard interrupts

This commit is contained in:
rofl0r
2019-01-05 17:11:08 +00:00
parent 47221bae94
commit bb3da7122e

3
ppf.py
View File

@@ -44,6 +44,7 @@ def import_from_file(fn, sqlite):
def fetch_contents(uri): def fetch_contents(uri):
headers = base_header headers = base_header
try: resp = requests.get(uri, timeout=45, headers=headers, verify=False, proxies=proxies) try: resp = requests.get(uri, timeout=45, headers=headers, verify=False, proxies=proxies)
except KeyboardInterrupt as e: raise e
except: return '' except: return ''
data = resp.text data = resp.text
@@ -112,6 +113,7 @@ def proxyleech(sqlite, rows):
for row in rows: for row in rows:
try: content = fetch_contents(row[0]) try: content = fetch_contents(row[0])
except KeyboardInterrupt as e: raise e
except: content = '' except: content = ''
uniques = [] uniques = []
@@ -119,6 +121,7 @@ def proxyleech(sqlite, rows):
if p in uniques: continue if p in uniques: continue
try: try:
if not is_reserved_ipv4(p.split(':')[0]): uniques.append(p) if not is_reserved_ipv4(p.split(':')[0]): uniques.append(p)
except KeyboardInterrupt as e: raise e
except: except:
pass pass