From a7cfa541ab4fd4c1cba01d5ed6970ceb3ae51bf1 Mon Sep 17 00:00:00 2001 From: "F.Schloeder" Date: Wed, 13 Feb 2019 18:07:42 +0100 Subject: [PATCH] Added support for https - nodes --- request.py | 14 ++++++++++---- results.py | 1 - 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/request.py b/request.py index 6ebb4aa..19c0f43 100644 --- a/request.py +++ b/request.py @@ -19,7 +19,7 @@ import nodes from urlparse import urlparse -from httplib import HTTPConnection, urlsplit, HTTPException, socket +from httplib import HTTPConnection, HTTPSConnection, urlsplit, HTTPException, socket from dateutil.parser import parse @@ -132,7 +132,10 @@ def dorequest(self, timeout = TIMEOUT, HttpMethod = "POST", parsexsams = True): url = self.baseurl + self.querypath urlobj = urlsplit(url) - conn = HTTPConnection(urlobj.netloc, timeout = timeout) + if urlobj.scheme == 'https': + conn = HTTPSConnection(urlobj.netloc, timeout = timeout) + else: + conn = HTTPConnection(urlobj.netloc, timeout = timeout) conn.putrequest(HttpMethod, urlobj.path+"?"+urlobj.query) conn.endheaders() @@ -181,8 +184,11 @@ def doheadrequest(self, timeout = TIMEOUT): url = self.baseurl + self.querypath urlobj = urlsplit(url) - - conn = HTTPConnection(urlobj.netloc, timeout = timeout) + + if urlobj.scheme == 'https': + conn = HTTPSConnection(urlobj.netloc, timeout = timeout) + else: + conn = HTTPConnection(urlobj.netloc, timeout = timeout) conn.putrequest("HEAD", urlobj.path+"?"+urlobj.query) conn.endheaders() diff --git a/results.py b/results.py index 6da9dc1..ed63883 100644 --- a/results.py +++ b/results.py @@ -16,7 +16,6 @@ import query as q from urlparse import urlparse -from httplib import HTTPConnection from dateutil.parser import parse