Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

changed Utils.get_url to catch SSL errors.

Browse source
This commit is contained in:
jesopo 2016-07-05 12:18:47 +01:00
parent a09bce0024
commit 5c19b2ea18
No known key found for this signature in database
GPG key ID: 0BBDEB2AEFCFFCB3
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Utils.py
View file

@ -1,4 +1,4 @@
import json, re, traceback, urllib.request, urllib.parse, urllib.error
import json, re, traceback, urllib.request, urllib.parse, urllib.error, ssl
import bs4
USER_AGENT = ("Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 "
@ -24,9 +24,9 @@ def seperate_hostmask(hostmask):
return nickname, username, hostname
def get_url(url, **kwargs):
scheme = urllib.parse.urlparse(url).scheme
if not scheme:
if not urllib.parse.urlparse(url).scheme:
url = "http://%s" % url
url_parsed = urllib.parse.urlparse(url)
method = kwargs.get("method", "GET")
get_params = kwargs.get("get_params", "")
@ -57,14 +57,17 @@ def get_url(url, **kwargs):
traceback.print_exc()
if kwargs.get("code"):
return e.code, False
else:
return False
return False
except urllib.error.URLError as e:
traceback.print_exc()
if kwargs.get("code"):
return -1, False
else:
return False
return False
except ssl.CertificateError as e:
traceback.print_exc()
if kwargs.get("code"):
return -1, False,
return False
response_content = response.read()
encoding = response.info().get_content_charset()